Fix doc install location, thanks to Chris Mayo for the patch, bug 154900

Package-Manager: portage-2.1.2_rc2-r2

diff --git a/media-libs/gle/ChangeLog b/media-libs/gle/ChangeLog
index cc6fbbd6a4833b04c8faaead314c4d36b82042ba..0c08c3e0cdee1cb9f3fa8f81f87a6fccc868192d 100644 (file)
--- a/media-libs/gle/ChangeLog
+++ b/media-libs/gle/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/gle
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gle/ChangeLog,v 1.25 2006/10/29 23:41:16 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gle/ChangeLog,v 1.26 2006/12/02 00:51:14 masterdriverz Exp $
+
+  02 Dec 2006; Charlie Shepherd <masterdriverz@gentoo.org>
+  gle-3.1.0-r1.ebuild:
+  Fix doc install location, thanks to Chris Mayo for the patch, bug 154900
 
   29 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> gle-3.1.0-r1.ebuild:
   Fix autotools dependencies. Closes bug #150142.

diff --git a/media-libs/gle/Manifest b/media-libs/gle/Manifest
index 74f29bc3e5171777183bd87347325ef223f0e768..b47cc409a17878ca747b3a178433bf90f724da2b 100644 (file)
--- a/media-libs/gle/Manifest
+++ b/media-libs/gle/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX configure-LANG.patch 1686 RMD160 4ff8355af81705058fd411910dfae94887bcd884 SHA1 67ae0deff73689cb39cd6e7451262bdda9c25a39 SHA256 dc9386b88eac48c282d63d0be7e7be81d4a0a08035a8b97138a61133e057bcea
 MD5 e0ebf10eb8bf4542ae57ba591daa68a4 files/configure-LANG.patch 1686
 RMD160 4ff8355af81705058fd411910dfae94887bcd884 files/configure-LANG.patch 1686
@@ -19,18 +16,18 @@ EBUILD gle-3.0.1-r3.ebuild 934 RMD160 0b183c796969896ac65e9ffb2dabff23b1b223a8 S
 MD5 1877d2e6429f72370502cfbe896e8a7d gle-3.0.1-r3.ebuild 934
 RMD160 0b183c796969896ac65e9ffb2dabff23b1b223a8 gle-3.0.1-r3.ebuild 934
 SHA256 344b3d48869845a8077c0246434e315e886c5f28e0ca168fe1affbaddadae01b gle-3.0.1-r3.ebuild 934
-EBUILD gle-3.1.0-r1.ebuild 1277 RMD160 ba285bb3b01f05bf9a7a88a35c4fef4d76f8018e SHA1 b3ae938c757323ffc2435e4c24e0b4ede1238113 SHA256 e7f1011873ac855c56d027858a873245f94e0d81fac8533707584a5d19909112
-MD5 fa2d0a0d609030bc42ce1be76a3850db gle-3.1.0-r1.ebuild 1277
-RMD160 ba285bb3b01f05bf9a7a88a35c4fef4d76f8018e gle-3.1.0-r1.ebuild 1277
-SHA256 e7f1011873ac855c56d027858a873245f94e0d81fac8533707584a5d19909112 gle-3.1.0-r1.ebuild 1277
+EBUILD gle-3.1.0-r1.ebuild 1453 RMD160 ec6d0cf7bdbce00b3a2fac428c86f62a58c04a39 SHA1 f478da01c4de06e798597fbab9b95bf974f4e8dd SHA256 2ce7f537a59279bac7da747091dbc96d4bb599cd69f66c61c6e4ad701d9483eb
+MD5 cbf6424354bb739905433f5cecab2d47 gle-3.1.0-r1.ebuild 1453
+RMD160 ec6d0cf7bdbce00b3a2fac428c86f62a58c04a39 gle-3.1.0-r1.ebuild 1453
+SHA256 2ce7f537a59279bac7da747091dbc96d4bb599cd69f66c61c6e4ad701d9483eb gle-3.1.0-r1.ebuild 1453
 EBUILD gle-3.1.0.ebuild 1106 RMD160 9439d6c2e4495926b832618e11cb326f86192671 SHA1 cf43aa50c4495e8964cb79d9d5b012700c142ed0 SHA256 638b29e36268c65a4eb1b7e0d57ed022b25728451586753ed9a13a85dd29a494
 MD5 fc6f938d85162bc6c6fbca1aaec4409c gle-3.1.0.ebuild 1106
 RMD160 9439d6c2e4495926b832618e11cb326f86192671 gle-3.1.0.ebuild 1106
 SHA256 638b29e36268c65a4eb1b7e0d57ed022b25728451586753ed9a13a85dd29a494 gle-3.1.0.ebuild 1106
-MISC ChangeLog 3445 RMD160 5ddacdd0e8894971aaf97467bbb2af47cdf15893 SHA1 0f46b81f5cb9d56b1f389fba009006e686089ea6 SHA256 5fd31fe1b6455bdb87a1df53404f8a4b9b42b313aae4475cebc98fe2a2d4ad58
-MD5 82f1b8f1bccefcaecbd11e86f19ab395 ChangeLog 3445
-RMD160 5ddacdd0e8894971aaf97467bbb2af47cdf15893 ChangeLog 3445
-SHA256 5fd31fe1b6455bdb87a1df53404f8a4b9b42b313aae4475cebc98fe2a2d4ad58 ChangeLog 3445
+MISC ChangeLog 3607 RMD160 2761e9f693fd0f65e6a0751618381fe1bc30b20d SHA1 2aed01042a3660081ea8ce78fbb42d64d22c6fdb SHA256 346571f1e278949ae66d5fceab17bb5233ed23b2354242381703a8496ab8e7d0
+MD5 c083ad8348c2f2b4c7bb5584f8675c6f ChangeLog 3607
+RMD160 2761e9f693fd0f65e6a0751618381fe1bc30b20d ChangeLog 3607
+SHA256 346571f1e278949ae66d5fceab17bb5233ed23b2354242381703a8496ab8e7d0 ChangeLog 3607
 MISC metadata.xml 232 RMD160 d5631c839d64b79ea7accc9a23ca30d64436b467 SHA1 b156ecba642bb171bc77738f32368a539c073343 SHA256 970b4473653d994ae8485ef08554a47b5751f4d644c3be72505ada89777441d1
 MD5 a0aedff056c6404a3996c7ce04fe2784 metadata.xml 232
 RMD160 d5631c839d64b79ea7accc9a23ca30d64436b467 metadata.xml 232
@@ -47,10 +44,3 @@ SHA256 0d3832e66ca4a1a6961e71c298072a3c065e47e9907d894b6d056b73d741a02f files/di
 MD5 fe526df1da8ef589b5bcf990422fdb86 files/digest-gle-3.1.0-r1 229
 RMD160 202b232dc0ae2b2728258f0ed4776f688603af5c files/digest-gle-3.1.0-r1 229
 SHA256 0d3832e66ca4a1a6961e71c298072a3c065e47e9907d894b6d056b73d741a02f files/digest-gle-3.1.0-r1 229
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFRTwjAiZjviIA2XgRAqn2AJ9vPaJns3gwcG79c4hI+kfNeUBhQwCgiInq
-W/AGWNpJcqhZzf0OPsOwA7k=
-=CbGQ
------END PGP SIGNATURE-----

diff --git a/media-libs/gle/gle-3.1.0-r1.ebuild b/media-libs/gle/gle-3.1.0-r1.ebuild
index c2acc6b024f992b65df0e440575dae2ef8987ee6..022aa3f7c645782ebe3709b39bb58fada8bbe461 100644 (file)
--- a/media-libs/gle/gle-3.1.0-r1.ebuild
+++ b/media-libs/gle/gle-3.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gle/gle-3.1.0-r1.ebuild,v 1.3 2006/10/29 23:41:16 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gle/gle-3.1.0-r1.ebuild,v 1.4 2006/12/02 00:51:14 masterdriverz Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="1.4"
@@ -41,11 +41,16 @@ src_compile() {
                --x-libraries=/usr/$(get_libdir)/opengl/xorg-x11 \
                || die "econf failed."
 
+       if use doc; then
+               sed -i -e 's:\$(datadir)/doc/gle:\$(datadir)/doc/${PF}:' doc/Makefile
+               sed -i -e 's:\$(datadir)/doc/gle/html:\$(datadir)/doc/${PF}/html:' doc/html/Makefile
+       fi
+
        emake || die "emake failed."
 }
 
 src_install() {
-       make DESTDIR="${D}" install || die "make install failed."
+       emake DESTDIR="${D}" install || die "make install failed."
        dodoc AUTHORS ChangeLog NEWS README
-       use doc || rm -rf "${D}"/usr/share/doc/gle
+       rm -rf "${D}/usr/share/doc/gle"
 }