Fixed compilation with --as-needed (bug 206817, patch by Arfrever Frehtes Taifersar Arahesis) and added missing include cstring (bug 228217, patch by Markus Peloquin)

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.28-rc8 x86_64

5 files changed, 47 insertions, 10 deletions

diff --git a/x11-misc/3ddesktop/3ddesktop-0.2.9.ebuild b/x11-misc/3ddesktop/3ddesktop-0.2.9.ebuild
index f59f6589b9a2..24ba9e505040 100644
--- a/x11-misc/3ddesktop/3ddesktop-0.2.9.ebuild
+++ b/x11-misc/3ddesktop/3ddesktop-0.2.9.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 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.ebuild,v 1.9 2006/10/22 00:18:33 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/3ddesktop/3ddesktop-0.2.9.ebuild,v 1.10 2008/12/17 18:48:58 angelos Exp $
 
-inherit eutils
+inherit autotools eutils
 
 DESCRIPTION="OpenGL virtual desktop switching"
 HOMEPAGE="http://desk3d.sourceforge.net/"
@@ -28,11 +28,17 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
 	unpack ${A}
+	cd "${S}"
+
 	epatch "${FILESDIR}/${P}-gcc4.patch"
+	epatch "${FILESDIR}/${P}-asneeded.patch"
+	epatch "${FILESDIR}/${P}-missing-include.patch"
+
+	eautoreconf
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install || die
 	dodoc README AUTHORS TODO ChangeLog README.windowmanagers
 }
 
diff --git a/x11-misc/3ddesktop/ChangeLog b/x11-misc/3ddesktop/ChangeLog
index de7a08bf042f..ea5037915b51 100644
--- a/x11-misc/3ddesktop/ChangeLog
+++ b/x11-misc/3ddesktop/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/3ddesktop
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/3ddesktop/ChangeLog,v 1.38 2008/11/17 22:59:09 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/3ddesktop/ChangeLog,v 1.39 2008/12/17 18:48:58 angelos Exp $
+
+  17 Dec 2008; Christoph Mende <angelos@gentoo.org>
+  +files/3ddesktop-0.2.9-asneeded.patch,
+  +files/3ddesktop-0.2.9-missing-include.patch, 3ddesktop-0.2.9.ebuild:
+  Fixed compilation with --as-needed (bug 206817, patch by Arfrever Frehtes
+  Taifersar Arahesis) and added missing include cstring (bug 228217, patch
+  by Markus Peloquin)
 
   17 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org>
   files/3ddesktop-0.2.9-gcc4.patch:
diff --git a/x11-misc/3ddesktop/Manifest b/x11-misc/3ddesktop/Manifest
index 7a5ef4ed54b0..687b6fce70b4 100644
--- a/x11-misc/3ddesktop/Manifest
+++ b/x11-misc/3ddesktop/Manifest
@@ -1,15 +1,17 @@
 -----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-missing-include.patch 267 RMD160 329a7fc313be95d431cd02bcb09651be464c4df6 SHA1 08c4ddb9bddaa82c58287596ab5dc680dd67c322 SHA256 ae26c13a1fe7f18f0c5a18bc18e32b0651a905277dca81653f2271adc45faf42
 DIST 3ddesktop-0.2.9.tar.gz 182278 RMD160 86ca9d9df57a83d2f4719ce45708e129bdc75fb4 SHA1 33ff86b559d0c0407ef4c6c989a9fcbf804f7e5f SHA256 8fde969c1aec60685e0a74d2ebcfa1ef570df454288d5774646e2b291515e8c5
-EBUILD 3ddesktop-0.2.9.ebuild 1413 RMD160 02547e38d86a7b9f2ca51cf5571a1b14c2b3ecd1 SHA1 1823807c0b072ec2bc96ac77140a37e47542c7b1 SHA256 6c6ff0563e584c7eb452b5ff8adcccdc995ac1c917697a5f2ae9c1030c3a3581
-MISC ChangeLog 4717 RMD160 bd7c68025754df4779587cd9de0e0101dcac455d SHA1 a587dc0e38db7059889308158b63155ae32da5bb SHA256 031661a912e6e9379ef9792bf60c914718677eb9ea876bf2c64029de6b02c70e
+EBUILD 3ddesktop-0.2.9.ebuild 1546 RMD160 7b9888e1f1dd0a37e80071cf2073829ef600f5b7 SHA1 4cc1f22a1a622a3940fd902b530e933fce92f451 SHA256 70918fb5e5ddbccdf67fb7d1d49cfef416f393c557c94695b5afb9e5dd50901d
+MISC ChangeLog 5054 RMD160 af6aeb29cfd7c322cf23db4bbc25f41646860f55 SHA1 ce3ca097ba7e68464859d5ccb422ebb4fdf91b59 SHA256 d1a3018e5464d9abaf69b44d512db6ef290d09768fa4568c6c1ffd848e8e0521
 MISC metadata.xml 436 RMD160 6f6d32ca0b968c907db7b81a8544c2f7751c3b50 SHA1 b4c065b8fe8f2dff48c51f65956f27868ae3d746 SHA256 66a61581b0078d5c9d1e919a55f753c13a7708dd03a134e7cb413582c1859b7a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkkh90IACgkQAiZjviIA2Xg7+wCfUoybt3zMVcTJo2+RiqhAG2uS
-F+AAoNNXsoo1YsLNO96yTswYJVAR28jy
-=j8Kz
+iEYEARECAAYFAklJSaIACgkQKhnDs22gwa8VZwCfVwc5friG4l7doBpBxgtFz0By
+m8QAoLcPxQFwDHUx4gG8W9/tNZUiLa2x
+=vBLl
 -----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
new file mode 100644
index 000000000000..6e1ca15fd363
--- /dev/null
+++ b/x11-misc/3ddesktop/files/3ddesktop-0.2.9-asneeded.patch
@@ -0,0 +1,11 @@
+--- Makefile.am
++++ Makefile.am
+@@ -37,7 +37,7 @@
+        camera.cpp \
+        config.cpp
+ 
+-3ddeskd_LDFLAGS = $(imlib2_libs) @GL_LIBS@ 
++3ddeskd_LDADD = $(imlib2_libs) @GL_LIBS@ 
+ 
+ noinst_HEADERS = 3ddesk.h \
+        arrange.hpp  \
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
new file mode 100644
index 000000000000..cc30fda093cc
--- /dev/null
+++ b/x11-misc/3ddesktop/files/3ddesktop-0.2.9-missing-include.patch
@@ -0,0 +1,11 @@
+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
+@@ -24,6 +24,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <cstring>
+ 
+ #include <errno.h>
+ #include <unistd.h>