diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2012-12-21 07:53:22 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2012-12-21 07:53:22 +0000 |
| commit | 836f6ed65ec5aa7c4aebdfabd3ee72734c58a7d0 (patch) | |
| tree | df565674eb834d902c0dab94bf36ac69db341e3a /games-emulation | |
| parent | Version bump. (diff) | |
| download | gentoo-2-836f6ed65ec5aa7c4aebdfabd3ee72734c58a7d0.tar.gz gentoo-2-836f6ed65ec5aa7c4aebdfabd3ee72734c58a7d0.tar.bz2 gentoo-2-836f6ed65ec5aa7c4aebdfabd3ee72734c58a7d0.zip | |
Use QA_PREBUILT. Bug #428546
Migrate to EAPI 4
(Portage version: 2.1.11.38/cvs/Linux i686, signed Manifest commit with key 0145142D)
Diffstat (limited to 'games-emulation')
| -rw-r--r-- | games-emulation/xe/ChangeLog | 7 | ||||
| -rw-r--r-- | games-emulation/xe/files/xe-2.16.2-gentoo.patch | 16 | ||||
| -rw-r--r-- | games-emulation/xe/xe-2.16.2.ebuild | 23 |
3 files changed, 33 insertions, 13 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/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 |