Use configure flags to install doc files and fix EAPI=4 handling of $ED.

Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

3 files changed, 34 insertions, 14 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/Manifest b/dev-cpp/glog/Manifest
index 740497bfd52d..a7ca5a08683f 100644
--- a/dev-cpp/glog/Manifest
+++ b/dev-cpp/glog/Manifest
@@ -4,14 +4,24 @@ Hash: SHA256
 AUX glog-0.3.2-avoid-inline-asm.patch 1837 SHA256 0771464b45ac79545ca0e8f3c489b842fdd61dc0585b917dc0b5f619dc2f2c55 SHA512 d45e6e1ef311a8eaccbbcf802c609c19509b74d0647a6ff4e2f0886ecd52d7f107c76d06cba88036870a4c34c62c19df661c59ea5011dff931ad14a3f5d8ab58 WHIRLPOOL b8f119c1b4e67ff016d5e041a6d91281fb79ebec00e608e19ebf8d53d42c3fabbf5bc8f29882bfa269f209b3034eeafc11ef080d65fa3948c223b95fcdf1d241
 DIST glog-0.3.1-1.tar.gz 491798 SHA256 0a5ce945aaa5c64cb3889bf4844a0459263c06a77ad549042230dfea316787cb SHA512 9bf48fe53e45a7af24ea6cfe27f6a4b592efe9911e2c9764c364d551ad9a7ab4eae2ace64873ec9bd2202323032ffbdbbda5ea9e7514aa0e324e30048c238e96 WHIRLPOOL 21593af929da3db01527c6e9111b75a7318be2c14abebbfb1e09f0a6ac12442e522cb510a776ef95136168baa1400e759bb69f7670192301ed1044db00eac385
 DIST glog-0.3.2.tar.gz 478666 SHA256 5e47f9437e97cb1621930dea3c557a2801ddac3b5db1a9fd0c3cde399f2c9ccd SHA512 75f61d63fd65df40995b657c47a6c2dcabd2e25716c7ac1d4229dfc6a43e5957576b9d090997ae0ec81b30b60df6fdc6ae1294a087cbc3d03ad42295980fddfd WHIRLPOOL c6649da59d7de673b39fdb4f6930c44ab6887595733468e9ed81928525892f21c23e0f8e9cb7aac383fdb3afa6f86aa683ccff5502b445c546f00bc44f4c75f2
-EBUILD glog-0.3.1.ebuild 732 SHA256 902919b0aad2eca483752b29465313dbc02844ad97f3d3955191017c36f6c0c3 SHA512 93ff418616c677cf584451b6c885e3964209cf6c5a0306eed6c575a9916de3684587a93f6b36d3fa550c49dcad3db8d7eb50acf6543277836ea28ad8c8800b06 WHIRLPOOL 1a0ce815988cac2247d87ffc9ed21785767a52dbb3c39fa85d110570427af6411dba5d968bbd5b1bcf1a32078e6d0d1b752f17e36916bd77acf9033c6aabf65f
-EBUILD glog-0.3.2.ebuild 1069 SHA256 43b8320ba6bdeb8bc4633e9c70ccd5500e4d2022ebbb30747fc6941ecd27d786 SHA512 75d36a46af10e8ab80c4bec052d61edf8344eb7a48883b8c9fa4e816bcd96b025b236f378b2b57b5c8aa272e9a5176a08d7389188e7801b297ee2feaa8b80d27 WHIRLPOOL 4007017bc5c094627e1246d67346a46c3070187a75de1f50ff8da52df0f9831ce75176e46ac3a23cd3156c2dec51aa67a9b9179787d47c9641c3c7def3c15c8f
-MISC ChangeLog 1185 SHA256 0c35a0ee0c982b233bc87226eacae0331268b32d5c657e7e1dd81d7d01e3288c SHA512 41fe457c92d2e6bf387aee526fd56c24f4a1125f89ca5fb205cabddebbd6d9488eff96c2fad1c8157be117d6c844e7a94574459d58435ac77d425f04e0554106 WHIRLPOOL f0f3a06393bab0b1f33524a2fd54b990cbd4a35abf361da850c85af8f4ba103f4ee7a54aacbe9703352831e31c399175e9a7e6973cbb32301ff24079f86d3cee
+EBUILD glog-0.3.1.ebuild 808 SHA256 d9dcd2ab292654db61887bfa096fb9094df6c67a1a35013aef61b92313ed053f SHA512 0b3e5fa9dbce90d0b05ba90c3188a7306013c2d2dce3159a92276bd735a313a4a0236714db6524c13a2340fea15c62c9ffbb99362d9c5f17545bce6b3e68a3ba WHIRLPOOL 6621d2db45e3f50e347a5657913de0f76c4095cf92c22e964930bdf9511b6d5892162481614af5e526bc449fe603d2bd1b5cab9ac9f1effbb860bf6c805861c9
+EBUILD glog-0.3.2.ebuild 1381 SHA256 dfdb35444402e1d95932f29395996da7affa5cabbbe730f24a8b6a7fc601bf38 SHA512 fc0c0df0cd8a7c04799a1eebf8a4e700b98af35af057a42cef8b02c5ec73e28ba6e7096cf88f668ec5bff583a90dc7dd088bf70ca3631a362ddb5d3c5cabf46b WHIRLPOOL 8e98bc119fc89e13f3166b818bcdc1642a5ba64a51e97d3e37ab99cd25f403690cd51a1ab71aec758e64179d9bc54d7b7e629aea34b18e38e80981ab56a5fe69
+MISC ChangeLog 1436 SHA256 49faddcf01a8bd1a63321825ebb03b8c5b7b7b4921223cadf22c0c7ddb67fd61 SHA512 253c04dfc9ebca797194f66479b1376eb26aa474a3a938af14f9022b8766313323613ac75197560fa45ea1d03dbeedf8b67286bf33a1cc20b0649ffc1c6f5129 WHIRLPOOL 94ebcb19a89d7b42ef2a6afdef9f399986713fc42f26dfe8cba74c32e08e00f8c807735760f2471d5166615b8f20c9b10e9ea92a7d26a7a4263283b497099a1c
 MISC metadata.xml 530 SHA256 603f2288ca0f1591435b72b5d17e430ca3180cb7c4e9418b36ee2eae3adaed1f SHA512 fed8600db6bd522dbe3a3ef58e22a7cc20ace57eb3b8e9ca7b6be0cf9ff5a881f38c2b643c93ff26452b10ed30cacb65283fe289e193280dcecca19995bdfd45 WHIRLPOOL da6478c7cdf0b5d72953a243fb32eb71ca709768c4a3cf96565e24301919e651ffcbf06d71fde33f6c681c8f9c22c023180b6d8cbe07fa6a2e622787c48cf453
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCqe58ACgkQ1ycZbhPLE2AkjACfWpxhZr+btGM8nweseQu6lBcB
-wC8AoKPWkCOhlesUl4z6fQDnY4DcfrAJ
-=LHU2
+iQIcBAEBCAAGBQJQ7yfpAAoJELEHsLL7fEFWMfUP/AyLdhW20F+x6IBaZM1HKBE4
+J2Yba/CJVIGFfGqE7zp5VUP3ZeMUNkctvdkjMHf+84FZ592w6F4qc2PL2CWFAzYF
+6VpPv6kz32E3nb+yzUkQFjcT1NH370+iAFdUx5nhC92LRU+OUjwLkd3l/OmuKOrl
+ksQPJSO9zk3gZiV0L8Fj1MhE/2I9+pXk1l7l5+D+5nRn5Qqfi2WOnduA0sJiNO5/
+EI9ohs6JS/M0OGcOrZqbxHOiCjqNz9U+WhjMVnG1+fElQVEUvQUN60TmPvuaM57x
+Tq4gjzZWv9BlOTtKRGMlwpxF60d3v3UnEu41/uVlAIZ84fFZbU2sQRvlIKmKDfY5
+rfitsDDTJojMY0ALoHztHwRtictDpN9gnihTeOD2OCgpFTAcYgowmof3+HYX3rXO
+vOag/w/4ixSxprAC3+0ZryVZalrSQ7+GWF54OM3uhd0be8oQDmMZxm3mO8rDCXWC
+M5Ss3NcK4mmUszB45WFOK4adsaaeye46HJbsY4azzm9UAesYEiFdF9ilIN5L3Pvd
+ThK8TtB+I7LE5A7NRWP1RFEcboRnwYH+AsMzKO70YydwX8iuqAzYRhBeLbfKr2le
+DTi6M8LxKvYOcUf6YhRx1sS6wF/Hgy8UgBhJZOwllAhY/kAJ/KWS8JEdgdyMJ/OW
+tBuGsM7m/M7x2kZ4Fhvr
+=5hSm
 -----END PGP SIGNATURE-----
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
 }