Fix linking against esound libs and clean up build process in general #106088 by Marien Zwart.

Package-Manager: portage-2.0.52-r1 http://ronaldmcnightrider.ytmnd.com/

3 files changed, 26 insertions, 35 deletions

diff --git a/games-puzzle/gtetrinet/ChangeLog b/games-puzzle/gtetrinet/ChangeLog
index 34e9ff9e959c..8f37c501ca1d 100644
--- a/games-puzzle/gtetrinet/ChangeLog
+++ b/games-puzzle/gtetrinet/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-puzzle/gtetrinet
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/gtetrinet/ChangeLog,v 1.11 2005/06/03 14:10:10 axxo Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/gtetrinet/ChangeLog,v 1.12 2005/09/16 01:13:05 vapier Exp $
+
+  16 Sep 2005; Mike Frysinger <vapier@gentoo.org> gtetrinet-0.7.9.ebuild:
+  Fix linking against esound libs and clean up build process in general
+  #106088 by Marien Zwart.
 
 *gtetrinet-0.7.9 (03 Jun 2005)
 
diff --git a/games-puzzle/gtetrinet/Manifest b/games-puzzle/gtetrinet/Manifest
index 05dab40f8582..1002af1dcb5d 100644
--- a/games-puzzle/gtetrinet/Manifest
+++ b/games-puzzle/gtetrinet/Manifest
@@ -1,22 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 69eee83b60a0818c2c54c623ffb26b13 gtetrinet-0.7.9.ebuild 1527
-MD5 2991c859700ebb3aed2fa6125716df4c gtetrinet-0.7.4.ebuild 1434
-MD5 df93930c42a88aa1678a14ebbe0b300f gtetrinet-0.7.8.ebuild 1531
-MD5 8908482225f399bef07d8d970b92b32c gtetrinet-0.7.5.ebuild 1519
-MD5 7a58a6e8fbfabfeb04d651f2c311126b gtetrinet-0.7.7.ebuild 1527
-MD5 7b430e600362bafdeff2622cc780322f ChangeLog 3839
 MD5 ced740229799575e35487154e4bc3c7b metadata.xml 652
-MD5 068602da69e46138504760c11850a4f7 files/digest-gtetrinet-0.7.4 143
-MD5 cd9f875bc7b09e6f41dea9e0f9004919 files/digest-gtetrinet-0.7.5 143
+MD5 bc4130eed8a21a2c7d091f524f1866c4 gtetrinet-0.7.9.ebuild 1407
+MD5 7a58a6e8fbfabfeb04d651f2c311126b gtetrinet-0.7.7.ebuild 1527
+MD5 94c19ff591c14e0db1dc19b0f1393940 ChangeLog 4015
 MD5 28baac0d4fdcd05afefc657e27785734 files/digest-gtetrinet-0.7.7 143
-MD5 b8ffa6af6ed9e325f9fbe7b327086186 files/digest-gtetrinet-0.7.8 143
 MD5 cc4bb567009396c6013ba18cb4d79307 files/digest-gtetrinet-0.7.9 143
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFCoGTm/rLF9B432nYRAr2/AKCWHesZR+Yf6K0ETmbv9QlSEOEPCgCfV1Pg
-SyRpBb6Xod0j1haZ5KHaLno=
-=aPVD
+iD8DBQFDKhw3gIKl8Uu19MoRAg3/AJ91/gvL5fvDoA9e9PlzCLYpVuQOqQCeIipP
+Tp3RRQOL0s601yQLmOYeTU0=
+=RG9h
 -----END PGP SIGNATURE-----
diff --git a/games-puzzle/gtetrinet/gtetrinet-0.7.9.ebuild b/games-puzzle/gtetrinet/gtetrinet-0.7.9.ebuild
index b8c2ff46e7c8..e044fb0518c3 100644
--- a/games-puzzle/gtetrinet/gtetrinet-0.7.9.ebuild
+++ b/games-puzzle/gtetrinet/gtetrinet-0.7.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/gtetrinet/gtetrinet-0.7.9.ebuild,v 1.1 2005/06/03 14:10:10 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/gtetrinet/gtetrinet-0.7.9.ebuild,v 1.2 2005/09/16 01:13:05 vapier Exp $
 
 # games after gnome2 so games' functions will override gnome2's
 inherit gnome2 games
@@ -12,7 +12,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~sparc ~ppc"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="nls ipv6"
 
 RDEPEND="dev-libs/libxml2
@@ -21,40 +21,33 @@ RDEPEND="dev-libs/libxml2
 	>=gnome-base/libgnome-2
 	>=gnome-base/libgnomeui-2"
 DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
 	dev-util/pkgconfig
 	nls? ( sys-devel/gettext )"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	return 0
+	cd "${S}"
 	sed -i \
-		-e "s:\$(datadir)/pixmaps:/usr/share/pixmaps:" \
-		-e "/DISABLE_DEPRECATED/d" \
-		{.,icons,src}/Makefile.in \
-		|| die "sed Makefile.in failed"
+		-e "/^pkgdatadir =/s:=.*:= ${GAMES_DATADIR}/${PN}:" \
+		src/Makefile.in themes/*/Makefile.in || die "sed themes"
+	sed -i \
+		-e '/^LDADD/s:$: @ESD_LIBS@:' \
+		-e '/^gamesdir/s:=.*:=@bindir@:' \
+		src/Makefile.in || die "sed bindir"
 }
 
 src_compile() {
-	egamesconf \
+	econf \
 		$(use_enable ipv6) \
-		--sysconfdir=/etc \
+		--bindir="${GAMES_BINDIR}" \
 		|| die
 	emake || die "emake failed"
 }
 
 src_install() {
-	USE_DESTDIR=1
-	gnome2_src_install
+	USE_DESTDIR=1 gnome2_src_install
 	dodoc AUTHORS ChangeLog NEWS README TODO
-
-	# move some stuff around
-	cd ${D}/${GAMES_PREFIX}
-	mkdir bin && mv games/gtetrinet bin/
-	rm -rf games && cd ${D}/${GAMES_DATADIR} && mv applications locale ../
-	use nls || rm -rf ../locale
-	mv ${WORKDIR}/gentoo ${D}/${GAMES_DATADIR}/${PN}/themes/
+	mv "${WORKDIR}"/gentoo "${D}/${GAMES_DATADIR}"/${PN}/themes/
 	prepgamesdirs
 }