Add multilib build support.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key D2E96200)

2 files changed, 75 insertions, 2 deletions

diff --git a/dev-cpp/glog/ChangeLog b/dev-cpp/glog/ChangeLog
index cae3eac976dd..9c3309b63b12 100644
--- a/dev-cpp/glog/ChangeLog
+++ b/dev-cpp/glog/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-cpp/glog
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glog/ChangeLog,v 1.14 2013/10/19 01:59:01 vapier Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glog/ChangeLog,v 1.15 2014/03/27 02:37:51 vapier Exp $
+
+*glog-0.3.3-r1 (27 Mar 2014)
+
+  27 Mar 2014; Mike Frysinger <vapier@gentoo.org> +glog-0.3.3-r1.ebuild:
+  Add multilib build support.
 
   19 Oct 2013; Mike Frysinger <vapier@gentoo.org> glog-0.3.3.ebuild:
   Add keywords for everyone.
diff --git a/dev-cpp/glog/glog-0.3.3-r1.ebuild b/dev-cpp/glog/glog-0.3.3-r1.ebuild
new file mode 100644
index 000000000000..fd207c596c15
--- /dev/null
+++ b/dev-cpp/glog/glog-0.3.3-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glog/glog-0.3.3-r1.ebuild,v 1.1 2014/03/27 02:37:51 vapier Exp $
+
+EAPI="4"
+inherit eutils multilib-minimal
+
+DESCRIPTION="Google's C++ logging library"
+HOMEPAGE="http://code.google.com/p/google-glog/"
+SRC_URI="http://google-glog.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="gflags static-libs unwind test"
+
+RDEPEND="gflags? ( dev-cpp/gflags[${MULTILIB_USEDEP}] )
+	unwind? ( sys-libs/libunwind )"
+DEPEND="${RDEPEND}
+	test? (
+		dev-cpp/gmock[${MULTILIB_USEDEP}]
+		dev-cpp/gtest[${MULTILIB_USEDEP}]
+	)"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.3.2-avoid-inline-asm.patch
+	# Fix the --dodcdir flag:
+	# https://code.google.com/p/google-glog/issues/detail?id=193
+	sed -i \
+		-e '/^docdir =/s:=.*:= @docdir@:' \
+		Makefile.in || die
+}
+
+multilib_src_configure() {
+	use test || export ac_cv_prog_GTEST_CONFIG=no
+	ECONF_SOURCE=${S} \
+	ac_cv_lib_gflags_main=$(usex gflags) \
+	ac_cv_lib_unwind_backtrace=$(usex unwind) \
+	econf \
+		--docdir="\$(datarootdir)/doc/${PF}" \
+		--htmldir='$(docdir)/html' \
+		$(use_enable static-libs static)
+}
+
+_emake() {
+	# The tests always get built ... disable them when unused.
+	emake $(usex test '' noinst_PROGRAMS=) "$@"
+}
+
+multilib_src_compile() {
+	_emake
+}
+
+multilib_src_install() {
+	_emake install DESTDIR="${D}"
+}
+
+multilib_src_install_all() {
+	# Punt docs we don't care about (NEWS is 0 bytes).
+	rm "${ED}"/usr/share/doc/${PF}/{COPYING,NEWS,README.windows} || die
+
+	# --htmldir doesn't work (yet):
+	# https://code.google.com/p/google-glog/issues/detail?id=144
+	dohtml "${ED}"/usr/share/doc/${PF}/*
+	rm "${ED}"/usr/share/doc/${PF}/*.{html,css}
+
+	use static-libs || find "${ED}" -name '*.la' -delete
+}