diff options
| -rw-r--r-- | dev-cpp/glog/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-cpp/glog/glog-0.3.2.ebuild | 21 |
2 files changed, 18 insertions, 8 deletions
diff --git a/dev-cpp/glog/ChangeLog b/dev-cpp/glog/ChangeLog index 3d9ef08ba8de..6819a849e05d 100644 --- a/dev-cpp/glog/ChangeLog +++ b/dev-cpp/glog/ChangeLog @@ -1,6 +1,9 @@ # 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.8 2013/01/10 20:39:56 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glog/ChangeLog,v 1.9 2013/01/10 20:40:38 vapier Exp $ + + 10 Jan 2013; Mike Frysinger <vapier@gentoo.org> glog-0.3.2.ebuild: + Use configure flags to install doc files and fix EAPI=4 handling of $ED. 10 Jan 2013; Mike Frysinger <vapier@gentoo.org> glog-0.3.1.ebuild: Add build fix to older version too. diff --git a/dev-cpp/glog/glog-0.3.2.ebuild b/dev-cpp/glog/glog-0.3.2.ebuild index 228d451e2f56..5b5ed8635855 100644 --- a/dev-cpp/glog/glog-0.3.2.ebuild +++ b/dev-cpp/glog/glog-0.3.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glog/glog-0.3.2.ebuild,v 1.4 2012/11/19 18:34:06 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glog/glog-0.3.2.ebuild,v 1.5 2013/01/10 20:40:38 vapier Exp $ EAPI="4" inherit eutils @@ -30,15 +30,22 @@ src_configure() { export ac_cv_lib_gflags_main=$(usex gflags) export ac_cv_lib_unwind_backtrace=$(usex unwind) use test || export ac_cv_prog_GTEST_CONFIG=no - econf $(use_enable static-libs static) + econf \ + --docdir="\${datarootdir}/doc/${PF}" \ + --htmldir="\${datarootdir}/doc/${PF}/html" \ + $(use_enable static-libs static) } src_install() { default - rm -rf "${D}/usr/share/doc" - dodoc AUTHORS ChangeLog NEWS README* - dohtml doc/* + # Punt docs we don't care about (NEWS is 0 bytes). + rm "${ED}"/usr/share/doc/${PF}/{COPYING,NEWS,README.windows} - use static-libs || rm "${D}"/usr/lib*/*.la + # --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 } |