Missing USE dep for imlib2. Tidy patches and include direct links to bugzilla in headers.

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

6 files changed, 55 insertions, 48 deletions

diff --git a/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild b/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild
index ed64e55c013c..7058f7bdad0f 100644
--- a/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild
+++ b/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild,v 1.5 2012/02/16 18:24:45 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild,v 1.6 2012/06/19 09:58:29 ssuominen Exp $
 
-EAPI=2
+EAPI=4
 inherit autotools eutils
 
 DESCRIPTION="OpenGL virtual desktop switching"
@@ -14,44 +14,42 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-RDEPEND="x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libXt
+RDEPEND="media-libs/freeglut
+	>=media-libs/freetype-2
+	media-libs/imlib2[X]
+	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXi
-	x11-libs/libXxf86vm
-	media-libs/imlib2
-	media-libs/freeglut
-	media-libs/freetype"
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libXxf86vm"
 DEPEND="${RDEPEND}
 	x11-proto/xf86vidmodeproto
 	x11-proto/xproto"
 
+DOCS="AUTHORS TODO ChangeLog README README.windowmanagers"
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc4.patch \
+	epatch \
+		"${FILESDIR}"/${P}-gcc4.patch \
 		"${FILESDIR}"/${P}-asneeded.patch \
 		"${FILESDIR}"/${P}-missing-include.patch \
 		"${FILESDIR}"/${P}-gl_init.patch
-	eautoreconf
-}
 
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS TODO ChangeLog README README.windowmanagers
+	eautoreconf
 }
 
 pkg_postinst() {
-	einfo
-	einfo "This ebuild installed a configuration file called /etc/3ddesktop.conf"
-	einfo "The default configuration makes a screenshot of the virtual desktops"
-	einfo "every X seconds. This is non-optimal behavior."
-	einfo
-	einfo "To enable a more intelligent way of updating the virtual desktops,"
-	einfo "execute the following:"
-	einfo
-	einfo "  echo \"AutoAcquire 0\" >> /etc/3ddesktop.conf"
-	einfo
-	einfo "This will cause 3ddesktop to update the virtual desktop snapshots"
-	einfo "only when a 3d desktop switch is required."
-	einfo
+	echo
+	elog "This ebuild installed a configuration file called /etc/3ddesktop.conf"
+	elog "The default configuration makes a screenshot of the virtual desktops"
+	elog "every X seconds. This is non-optimal behavior."
+	elog
+	elog "To enable a more intelligent way of updating the virtual desktops,"
+	elog "execute the following:"
+	elog
+	elog "  echo \"AutoAcquire 0\" >> /etc/3ddesktop.conf"
+	elog
+	elog "This will cause 3ddesktop to update the virtual desktop snapshots"
+	elog "only when a 3d desktop switch is required."
 }
diff --git a/x11-misc/3ddesktop/ChangeLog b/x11-misc/3ddesktop/ChangeLog
index 47600cf94fff..aa58ea808d47 100644
--- a/x11-misc/3ddesktop/ChangeLog
+++ b/x11-misc/3ddesktop/ChangeLog
@@ -1,9 +1,13 @@
 # ChangeLog for x11-misc/3ddesktop
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/3ddesktop/ChangeLog,v 1.45 2012/02/17 04:12:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/3ddesktop/ChangeLog,v 1.46 2012/06/19 09:58:29 ssuominen Exp $
+
+  19 Jun 2012; Samuli Suominen <ssuominen@gentoo.org>
+  3ddesktop-0.2.9-r1.ebuild:
+  Missing USE dependency media-libs/imlib2[X] wrt #421927
 
   17 Feb 2012; Jeroen Roovers <jer@gentoo.org> -3ddesktop-0.2.9.ebuild:
-  Old.
+  old
 
   16 Feb 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   3ddesktop-0.2.9-r1.ebuild:
@@ -36,9 +40,6 @@
   files/3ddesktop-0.2.9-gcc4.patch:
   Fix patch with absolute paths.
 
-  21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
-  Redigest for Manifest2
-
   22 Oct 2006; David Shakaryan <omp@gentoo.org> 3ddesktop-0.2.9.ebuild:
   Remove monolithic X from dependencies.
 
diff --git a/x11-misc/3ddesktop/Manifest b/x11-misc/3ddesktop/Manifest
index 144f782ce7aa..d18e147091ed 100644
--- a/x11-misc/3ddesktop/Manifest
+++ b/x11-misc/3ddesktop/Manifest
@@ -1,18 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 3ddesktop-0.2.9-asneeded.patch 234 RMD160 4d46441ab107a7598f50916dcf0a62f7e0061baf SHA1 a1c566ecede4bee635d9f5a3c3777298c47bd948 SHA256 a7b774a780ec313bdf67f7c3252c2826c1a05792cf235f302d1098647438d4f0
-AUX 3ddesktop-0.2.9-gcc4.patch 529 RMD160 2873ccb51a781a8bf0019f7aae018021528f485a SHA1 7bfc06d5434e7f2fd84cfea6a43b348406b12841 SHA256 1a03b4fbe1c23749bc03987774444abaf6affc4223ec17fee34bf7c75a791db9
+AUX 3ddesktop-0.2.9-asneeded.patch 265 RMD160 379177239ad7b350b81877757a2dbfba9d2eb224 SHA1 e09055cadb4bac16d95594f07bc540dae71304c4 SHA256 d98261a6ddc40d4c67819cd2f7005e9aa9c7f2d7ac45997a83e7b6294623e711
+AUX 3ddesktop-0.2.9-gcc4.patch 367 RMD160 5ff1a5ade61a8bff5ffb7a766924ba8bd7400577 SHA1 8461fa7c0ad7c9d67330977979145c995443c03e SHA256 49bc113f3c6dad2f93ecaf553ec301fc989747087326db6bd3308d340ec0d6f1
 AUX 3ddesktop-0.2.9-gl_init.patch 522 RMD160 651962762f708140c6075d1830a5dc67a5a66105 SHA1 7a74bde3d778868adaa94f493473e1e23a918568 SHA256 7a291b8f95ddcc59dc822c43c1d34e7a584a50ef3d7b9c2b55347b188769ab7b
-AUX 3ddesktop-0.2.9-missing-include.patch 267 RMD160 329a7fc313be95d431cd02bcb09651be464c4df6 SHA1 08c4ddb9bddaa82c58287596ab5dc680dd67c322 SHA256 ae26c13a1fe7f18f0c5a18bc18e32b0651a905277dca81653f2271adc45faf42
+AUX 3ddesktop-0.2.9-missing-include.patch 185 RMD160 545b5417efc3825205c8e77e02d151a2e3b137bb SHA1 cab0dc5de06b26b77e15a01d09af487ca377bb7a SHA256 d7066810d4e54877ec31b925254dfe295d13efbd498d1f6b94c3166b78093354
 DIST 3ddesktop-0.2.9.tar.gz 182278 RMD160 86ca9d9df57a83d2f4719ce45708e129bdc75fb4 SHA1 33ff86b559d0c0407ef4c6c989a9fcbf804f7e5f SHA256 8fde969c1aec60685e0a74d2ebcfa1ef570df454288d5774646e2b291515e8c5
-EBUILD 3ddesktop-0.2.9-r1.ebuild 1569 RMD160 1b1d9ff2ca5111877035f09a97472e5fe790dcd9 SHA1 e61b64743620a40e331ddf063239c3d879399c18 SHA256 edd48393d82c7543c3476d4ccbbcc05300be0d229a60d7e92ca5e6ce53875735
-MISC ChangeLog 5851 RMD160 6de5ed945bfa9f51c589fb3347df4fd74acd29a3 SHA1 4e1ad7d99bfc29224c2ae44e5ceacba958fbd951 SHA256 f3db33c70b72bfc8476af62b6ca807080ad87f8729297f8f07ac92c615fe66fd
+EBUILD 3ddesktop-0.2.9-r1.ebuild 1506 RMD160 97f0c19315ba8d9496eb3a4fc55fe5d32692fe21 SHA1 0aa0c5b2d06cc407909c786dcd012b4ada41c143 SHA256 f5fb0f88d92c7aabe9025a065675651ccfe837c144dd6ed4f8155d591261e7c9
+MISC ChangeLog 5912 RMD160 7182f17e32417dd4f7c0e5d6fc94b49cc1b9e61e SHA1 d04e5412483340a61b7978aa09cd8e82e800f272 SHA256 e5f7f8a09a9a544167847abbf69621b1dfafe419b6d7b7b102a206a8d9575f92
 MISC metadata.xml 436 RMD160 6f6d32ca0b968c907db7b81a8544c2f7751c3b50 SHA1 b4c065b8fe8f2dff48c51f65956f27868ae3d746 SHA256 66a61581b0078d5c9d1e919a55f753c13a7708dd03a134e7cb413582c1859b7a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk89088ACgkQVWmRsqeSphPZkgCeOn3RjjvzTZrxjG60gBzVnjOf
-0sQAn3DsbXZSy5GAtyyW6ei3Xy+rAvm/
-=h/N5
+iQEcBAEBAgAGBQJP4Ew4AAoJEEdUh39IaPFNvoQIAKROTx3hTqLt7vSRJ+xYN7Zv
+b/p+DQ7R4gmxk4ipax4BGUUOo1v5rSF6UF520WzJXZ08IgI4D9L2ZE8HcGmzB80o
+/47j9ZQdwwsVd6cY3KBA+JyN8cp02wh/KVyC3F3ObxCR/doALJuxD/JKtWBwxRzP
+O+khWkGTb6fxUVWFUG3Di9oB/Ie5X6ZvrFYuJSeRJSXVJ6KF1VfCtRKYmYxBE8TV
+9eFMM+toAnT6zl01belufC8yNS1MqyELu7CUdlSDsbYqMlrc3jJlsfyx6UFL9lA8
+uNW8EZvPI7sjYp2bkkT0eKIEAxIntyhd4BfTQxw+PyVjAzN+ZHTfIpSGSMPGBUA=
+=Skcr
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/3ddesktop/files/3ddesktop-0.2.9-asneeded.patch b/x11-misc/3ddesktop/files/3ddesktop-0.2.9-asneeded.patch
index 6e1ca15fd363..135472a323b6 100644
--- a/x11-misc/3ddesktop/files/3ddesktop-0.2.9-asneeded.patch
+++ b/x11-misc/3ddesktop/files/3ddesktop-0.2.9-asneeded.patch
@@ -1,3 +1,5 @@
+http://bugs.gentoo.org/206817
+
 --- Makefile.am
 +++ Makefile.am
 @@ -37,7 +37,7 @@
diff --git a/x11-misc/3ddesktop/files/3ddesktop-0.2.9-gcc4.patch b/x11-misc/3ddesktop/files/3ddesktop-0.2.9-gcc4.patch
index 01545a7ce393..8cde1eb524f6 100644
--- a/x11-misc/3ddesktop/files/3ddesktop-0.2.9-gcc4.patch
+++ b/x11-misc/3ddesktop/files/3ddesktop-0.2.9-gcc4.patch
@@ -1,6 +1,7 @@
-diff -urNad 3ddesktop-0.2.9/event.hpp /tmp/dpep.QstFBy/3ddesktop-0.2.9/event.hpp
---- 3ddesktop-0.2.9.orig/event.hpp   2004-12-06 03:57:32.000000000 +0100
-+++ 3ddesktop-0.2.9/event.hpp  2005-07-06 21:50:00.000000000 +0200
+http://bugs.gentoo.org/118458
+
+--- event.hpp
++++ event.hpp
 @@ -74,7 +74,7 @@
          list<Event *>::iterator k;
          for (k = events.begin(); k != events.end(); ++k) {
diff --git a/x11-misc/3ddesktop/files/3ddesktop-0.2.9-missing-include.patch b/x11-misc/3ddesktop/files/3ddesktop-0.2.9-missing-include.patch
index cc30fda093cc..45970c19739e 100644
--- a/x11-misc/3ddesktop/files/3ddesktop-0.2.9-missing-include.patch
+++ b/x11-misc/3ddesktop/files/3ddesktop-0.2.9-missing-include.patch
@@ -1,6 +1,7 @@
-diff -u -r a/config.hpp b/config.hpp
---- a/config.hpp	2005-06-20 13:28:29.000000000 +0200
-+++ b/config.hpp	2008-12-17 19:40:05.000000000 +0100
+http://bugs.gentoo.org/228217
+
+--- config.hpp
++++ config.hpp
 @@ -24,6 +24,7 @@
  
  #include <stdio.h>