Adjusting dependency and fix missing GLU in linking command.

Fix bug #294293
Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 42 insertions, 27 deletions

diff --git a/games-puzzle/construo/ChangeLog b/games-puzzle/construo/ChangeLog
index 10b220ec2750..9b3170a846d0 100644
--- a/games-puzzle/construo/ChangeLog
+++ b/games-puzzle/construo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-puzzle/construo
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/construo/ChangeLog,v 1.13 2008/05/01 13:11:32 nyhm Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/construo/ChangeLog,v 1.14 2009/11/24 17:37:06 tupone Exp $
+
+  24 Nov 2009; Tupone Alfredo <tupone@gentoo.org> construo-0.2.2.ebuild,
+  +files/construo-0.2.2-lGLU.patch:
+  Adjusting dependency and fix missing GLU in linking command.
+  Fix bug #294293 by flameeyes@gentoo.org
 
   01 May 2008; Tristan Heaven <nyhm@gentoo.org>
   +files/construo-0.2.2-gcc43.patch, construo-0.2.2.ebuild:
@@ -12,7 +17,7 @@
   21 Dec 2007; nixnut <nixnut@gentoo.org> construo-0.2.2.ebuild:
   Stable on ppc wrt bug 201403
 
-  22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
+  22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
 
   06 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> construo-0.2.2.ebuild:
diff --git a/games-puzzle/construo/Manifest b/games-puzzle/construo/Manifest
index 47773c98b09c..858e3a5ed5d7 100644
--- a/games-puzzle/construo/Manifest
+++ b/games-puzzle/construo/Manifest
@@ -1,15 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX construo-0.2.2-gcc43.patch 1785 RMD160 019a88e54cbd79114a7403f836fc35dfb4bfaf9b SHA1 5adb7a7b02c0754ce9e18e958b6a899eab49d274 SHA256 9c3c660ed4cbf2c5acaacd6d63f48aa08eeac025fc31b41118aef8fd1e9f1c65
+AUX construo-0.2.2-lGLU.patch 416 RMD160 f8d60b75f0fb6bf6572f8a2545e73f0029ba57aa SHA1 89c1eacbbd4cbc0219bca74ed1a85d630351bf7a SHA256 e8208f3572b5807aadb8d5e6c46a5d8cd20d6cb7e246bfb6e0956440d91ca7f3
 DIST construo-0.2.2.tar.gz 442626 RMD160 7e87090e557d41cf13bf0a364fec20c115c35107 SHA1 b0a3c1ae2a25530a70d7a405a1c48bd386a1999a SHA256 93b1dc5c26aab42d886f102e501189982c28d390f8b573f8f4a42bad640ec630
-EBUILD construo-0.2.2.ebuild 969 RMD160 9647e0676588f6fd573b4c031cc8d5497672ee5b SHA1 5ce641d16edb9f47172069fd16f7ac97dd6c723b SHA256 748ee92eba00d84c93c0a304f46618a911279d17fc87e2dfbcba35f5a267ef64
-MISC ChangeLog 1422 RMD160 ac0725beb39e051acc8bf4ac5dd6cf79dad248a8 SHA1 8c738c116d65002aa22fcca9444a0f296cefa26a SHA256 bac8e22bd43ceb18122e74444f6e64e88c4fcc068857365004fdfe9996fe3f57
+EBUILD construo-0.2.2.ebuild 996 RMD160 329604d7754ad9a2c560d401e972c1eda7f6ce7d SHA1 8df53963c1075b4225561e65a424129c75f0366a SHA256 3a5d33192de7c7842f0d3c9dcb1218563e15fca036bb350769fd07459caec42b
+MISC ChangeLog 1641 RMD160 daa2efdf32ce51fdaacd37be97fdf5f06a82f520 SHA1 43dff490aa893d3443dde9c6a994f32f7071dd22 SHA256 f137ba25f4bb6ebe7a5232016edf7ed2795caba0a89f9ea33e9bb5ac7baf8c47
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkgZwYoACgkQdz7hIScOUREUywCgpo4DglFJACAd4aYiApsi3mTL
-5oAAn0FP242aI6j3Vf9AoTlSliA+pCQt
-=nFbX
------END PGP SIGNATURE-----
diff --git a/games-puzzle/construo/construo-0.2.2.ebuild b/games-puzzle/construo/construo-0.2.2.ebuild
index 6df7cd0f6736..ccfff416d0e1 100644
--- a/games-puzzle/construo/construo-0.2.2.ebuild
+++ b/games-puzzle/construo/construo-0.2.2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/construo/construo-0.2.2.ebuild,v 1.14 2008/05/01 13:11:32 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/construo/construo-0.2.2.ebuild,v 1.15 2009/11/24 17:37:06 tupone Exp $
+EAPI=2
 
-inherit eutils games
+inherit eutils autotools games
 
 DESCRIPTION="2d construction toy with objects that react on physical forces"
 HOMEPAGE="http://www.nongnu.org/construo/"
@@ -13,21 +14,21 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-RDEPEND="x11-libs/libSM
-	x11-libs/libXxf86vm
-	x11-libs/libXt"
+RDEPEND="virtual/opengl
+	virtual/glu
+	virtual/glut
+	x11-libs/libXxf86vm"
 DEPEND="${RDEPEND}
 	x11-proto/xf86vidmodeproto"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gcc43.patch
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-lGLU.patch
+	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	egamesconf --datadir="${GAMES_DATADIR_BASE}" || die
-	emake || die "emake failed"
 }
 
 src_install() {
diff --git a/games-puzzle/construo/files/construo-0.2.2-lGLU.patch b/games-puzzle/construo/files/construo-0.2.2-lGLU.patch
new file mode 100644
index 000000000000..daca8de84520
--- /dev/null
+++ b/games-puzzle/construo/files/construo-0.2.2-lGLU.patch
@@ -0,0 +1,18 @@
+--- configure.ac.old	2009-11-24 18:27:48.000000000 +0100
++++ configure.ac	2009-11-24 18:28:29.000000000 +0100
+@@ -114,7 +114,7 @@
+ AC_CHECK_LIB(glut, glutMainLoop,
+ [
+   ConstruoTargets="$ConstruoTargets construo.glut"
+-  AC_SUBST(glut_LIBS,"-lglut")
++  AC_SUBST(glut_LIBS,"-lglut -lGLU")
+ ],
+ [])
+ 
+@@ -158,4 +158,4 @@
+ echo "  Ingo Ruhnke <grumbel@gmx.de>"
+ echo ""
+ 
+-# EOF #
+\ No newline at end of file
++# EOF #