Use QA_PREBUILT. Bug #428546

Migrate to EAPI 4

Package-Manager: portage-2.1.11.38/cvs/Linux i686
Manifest-Sign-Key: 0x0145142D

4 files changed, 50 insertions, 19 deletions

diff --git a/games-emulation/xe/ChangeLog b/games-emulation/xe/ChangeLog
index f42e3745e199..af4b9f306fc2 100644
--- a/games-emulation/xe/ChangeLog
+++ b/games-emulation/xe/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-emulation/xe
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/xe/ChangeLog,v 1.14 2012/05/04 04:38:39 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/xe/ChangeLog,v 1.15 2012/12/21 07:53:22 tupone Exp $
+
+  21 Dec 2012; Tupone Alfredo <tupone@gentoo.org> xe-2.16.2.ebuild,
+  +files/xe-2.16.2-gentoo.patch:
+  Use QA_PREBUILT. Bug #428546 by Diego
+  Migrate to EAPI 4
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> xe-2.16.2.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/games-emulation/xe/Manifest b/games-emulation/xe/Manifest
index 02f3b8d65d52..2e61617fbe50 100644
--- a/games-emulation/xe/Manifest
+++ b/games-emulation/xe/Manifest
@@ -1,6 +1,17 @@
-AUX xe-2.16.2 173 RMD160 57f4f82d70108e7a515624117a97fc1f2738eae8 SHA1 ea5540cd09742042149f8adf0243d66242d92cce SHA256 4c8ff5e8e42525b0cf8e56ff0f8a4305a5a8c5fc702d3c71c8f01f8bb88faab1
-DIST xe-x86-32-bin.2.16.2.tar.bz2 1610395 RMD160 333dd9df84788c83e5d0d83350ad944aec35540c SHA1 c682309434803b4eedfa58c581407b07a463995f SHA256 fff82a9e56d8f03d14395eeebb9306de7b3a03df6af12b0acc11b0206d1212f0
-DIST xe-x86-64-bin.2.16.2.tar.bz2 2141614 RMD160 b701866bef5e66500c33745349fc5952d89dbb47 SHA1 57cbe67c28531aa663eca1d5fc2d89247920f4b7 SHA256 73a035c20b56fe197529aeb034ce3b81c680e184d0acca7d48df7fedbbafb103
-EBUILD xe-2.16.2.ebuild 1376 RMD160 6360810f10d281332974bf30d3834516ba3bd179 SHA1 fb28512a9d6772de1c2f8a6d031851f0589b4640 SHA256 f8731c050227ef2b6947963815f20cb7c0c48f5e8e576fcf7b4dd5ed45d28d2c
-MISC ChangeLog 1978 RMD160 b34dca49d62617a774f07a94cbb386030c48b912 SHA1 511742e1216cf6863719ae6ef57b4b886248595c SHA256 483582223d027273f0dafc84983946eaef6a410dc1201c83d33ea9330b665e46
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX xe-2.16.2 173 SHA256 4c8ff5e8e42525b0cf8e56ff0f8a4305a5a8c5fc702d3c71c8f01f8bb88faab1 SHA512 6e5812cf355ded200a9fd16d41fca76938ca0526b120858771e0a900c2e4129ec5b00808f20ce4577df3643324dea6526296424c387db5babc36e1266ec8546b WHIRLPOOL a255794b8f56b81d4cc0b8b1f222ef5751f364e8c55f969375e40accec071a62b0fed611fb6856bd3d939a3006fc7277dabc0832a9e100484cddd8d715e25e0f
+AUX xe-2.16.2-gentoo.patch 506 SHA256 ad1b28501011787e8b3c4598a132f3026f88e9e82306878a6d36ef8731eb8e02 SHA512 31a215532c2fb17fd7234ba6a5375c465d6336f82625a5406ac361a29929da787a8bf5398cd21425682de2bd350790d03eca2be666b7f000c90b8c1839cfe618 WHIRLPOOL df733bc33ac93e9ebe7c5e218eef7010a7df9ed3ff95dc545a8c5ceecf63a262fb90fb668a345e936d79a44ba382da09c8dc24739f3639dc6d7930decd4f6aa8
+DIST xe-x86-32-bin.2.16.2.tar.bz2 1610395 SHA256 fff82a9e56d8f03d14395eeebb9306de7b3a03df6af12b0acc11b0206d1212f0 SHA512 b73f79854f860f7e7060c8b09e0a038b787762d3bd440b5b2825b5a702e4f32c788b883012728813e0a9dcee779f8b98b807c8af3f655fea21bd0ed1383e361c WHIRLPOOL 0c6c18c53105859ec44767cbc21fdf82e14ea4532fe26ecf9dec2acc6917af2baa80df7d8050ce9206ad189a2d8ac5cad1b17c7daa86d69ebcc04b4e83d1cabf
+DIST xe-x86-64-bin.2.16.2.tar.bz2 2141614 SHA256 73a035c20b56fe197529aeb034ce3b81c680e184d0acca7d48df7fedbbafb103
+EBUILD xe-2.16.2.ebuild 1305 SHA256 dab4e23c77e89bbc93139a4fd09c111fee5c4e3cbf625211c7c864bfe94fcce6 SHA512 aacb6f0938f8c0090529eccf1e732fbd56209e675acc0d425c426c5a9a8c940c9cb05b484eac368851a2456ea50ecc751955eff751d67b60947f8e88df283ee2 WHIRLPOOL 5920b3fde7c1ce711f7c15d799e1391c60fca89a5f82dab4b42ca5c75a1a64d6cc2f0da23d0eac628bb748b768597fa6ab0ca4643ca856d5afcc6e4775a361b8
+MISC ChangeLog 2140 SHA256 d826d578bc752d0ddf572254b3fef438baf7cc614503a3506d53314627f5434a SHA512 e22ee9a5d65d4bd6a1fa1c61a4d75f72ad3baab324985a41c780efb8e88c0c42f2f973a2464b972ef9cacce08dca71955fdf96f0f1c28c7629a9c37778540ee2 WHIRLPOOL e5377df72b9a99fec00aac5e2defd3dc7ad8d5b31f310cf5e23d575c23193c63d5607e15f0a4d7fede944efd15ce6d444eec30b71c5a6553e017d5b25a5734bc
+MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlDUFXkACgkQIY77eQFFFC1wNwCfdAEq6Fyp2VdQV/TUO37SE9WO
+8s8AoM8bwTE90eJvMlmwQFGNSEJ5Pzse
+=BNv5
+-----END PGP SIGNATURE-----
diff --git a/games-emulation/xe/files/xe-2.16.2-gentoo.patch b/games-emulation/xe/files/xe-2.16.2-gentoo.patch
new file mode 100644
index 000000000000..caea9c8c6c2e
--- /dev/null
+++ b/games-emulation/xe/files/xe-2.16.2-gentoo.patch
@@ -0,0 +1,16 @@
+--- Makefile.old	2012-12-20 21:20:49.560756950 +0100
++++ Makefile	2012-12-20 21:22:16.644707544 +0100
+@@ -1,11 +1,9 @@
+ BIN	= xe
+-CC	= gcc
+-CFLAGS	= -Wl,-export-dynamic -L. -L/usr/X11R6/lib -lxe -lasound -ldl -lz     \
++LDLIBS	= -L. -L/usr/X11R6/lib -lxe -lasound -ldl -lz     \
+ 	  -lX11 -lXext -lXv -lXinerama -lXxf86vm `pkg-config gtk+-2.0 --libs`
+ 
+ $(BIN): libxe.a
+-	@ $(CC) -o $(BIN) $(CFLAGS)
+-	@ strip $(BIN)
++	$(CC) -o $(BIN) $(LDFLAGS) -Wl,-export-dynamic $(LDLIBS)
+ 
+ install:
+ 	@ sh install.sh
diff --git a/games-emulation/xe/xe-2.16.2.ebuild b/games-emulation/xe/xe-2.16.2.ebuild
index 9e59f257011e..fb7beacc074b 100644
--- a/games-emulation/xe/xe-2.16.2.ebuild
+++ b/games-emulation/xe/xe-2.16.2.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/games-emulation/xe/xe-2.16.2.ebuild,v 1.4 2012/05/04 04:38:39 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/xe/xe-2.16.2.ebuild,v 1.5 2012/12/21 07:53:22 tupone Exp $
 
-EAPI=2
+EAPI=4
 inherit games
 
 DESCRIPTION="a multi system emulator for many console and handheld video game systems"
@@ -25,29 +25,28 @@ RDEPEND="x11-libs/libXv
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+dir=${games_get_libdir}/${PN}
+
+QA_PREBUILT="${dir:1}/modules/*
+	${GAMES_BINDIR:1}/xe.bin"
+
 src_unpack() {
 	unpack ${A}
 	mv -v * ${P} || die
 }
 
 src_prepare() {
-	sed -i \
-		-e '/strip/d' \
-		-e '/^CC/d' \
-		-e '/CC/s/$/ $(LDFLAGS)/' \
-		-e 's/@//' \
-		Makefile \
-		|| die "sed failed"
+	epatch "${FILESDIR}"/${P}-gentoo.patch
 }
 
 src_install() {
-	newgamesbin xe xe.bin || die "newgamesbin failed"
-	newgamesbin "${FILESDIR}"/xe-${PV} xe || die "newgamesbin failed"
+	newgamesbin xe xe.bin
+	newgamesbin "${FILESDIR}"/xe-${PV} xe
 	sed -i \
 		-e "s:GENTOODIR:$(games_get_libdir)/${PN}:" "${D}/${GAMES_BINDIR}/xe" \
 		|| die "sed failed"
 	insinto "$(games_get_libdir)"/${PN}
-	doins -r modules/ rc/ || die "doins failed"
+	doins -r modules/ rc/
 	keepdir "$(games_get_libdir)"/${PN}/bios
 	dodoc README.txt
 	dohtml manual.html