From: Tristan Heaven Date: Sat, 24 Feb 2007 00:53:40 +0000 (+0000) Subject: Fix dependencies, bug #168179 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a6317a7094df84d114f4f2c927b07586be3a27c7;p=gentoo.git Fix dependencies, bug #168179 Package-Manager: portage-2.1.2-r10 --- diff --git a/games-emulation/pcsx/ChangeLog b/games-emulation/pcsx/ChangeLog index b7cddf991937..368d6907c14e 100644 --- a/games-emulation/pcsx/ChangeLog +++ b/games-emulation/pcsx/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-emulation/pcsx -# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/pcsx/ChangeLog,v 1.9 2006/07/25 04:19:19 mr_bones_ Exp $ +# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-emulation/pcsx/ChangeLog,v 1.10 2007/02/24 00:53:40 nyhm Exp $ + + 24 Feb 2007; Tristan Heaven files/pcsx, + pcsx-1.5-r1.ebuild: + Fix dependencies, bug #168179 25 Jul 2006; Michael Sterrett pcsx-1.5-r1.ebuild: avoid pre-stripping binaries; tidy - patch from Tristan Heaven via bug #137830 diff --git a/games-emulation/pcsx/Manifest b/games-emulation/pcsx/Manifest index 3c936db03287..40fea1382867 100644 --- a/games-emulation/pcsx/Manifest +++ b/games-emulation/pcsx/Manifest @@ -1,24 +1,27 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX 1.5-gentoo.patch 365 RMD160 5d6c20591c1017c7ab17227c797a98ec71ce3d21 SHA1 cc97ee21b287f43ec27d099f6211b34ad57038ac SHA256 150ad420d192e8073ad2441d3f80aa8f3601a17388f9fd805871f6e81c8c75c0 MD5 2f9732780627a19f6cf58f4f46ae93a4 files/1.5-gentoo.patch 365 RMD160 5d6c20591c1017c7ab17227c797a98ec71ce3d21 files/1.5-gentoo.patch 365 SHA256 150ad420d192e8073ad2441d3f80aa8f3601a17388f9fd805871f6e81c8c75c0 files/1.5-gentoo.patch 365 -AUX pcsx 1314 RMD160 8d7aafee605d29379085a7235a4c9c0476471540 SHA1 04fb005298002ed120a7dbcfaffcca953fed84a3 SHA256 2ffdaa6301ecd867cc2a40f080c212c667ba28a7a159baac953c39a695a7842f -MD5 fdf3d6afdc389182742ce8e378b17916 files/pcsx 1314 -RMD160 8d7aafee605d29379085a7235a4c9c0476471540 files/pcsx 1314 -SHA256 2ffdaa6301ecd867cc2a40f080c212c667ba28a7a159baac953c39a695a7842f files/pcsx 1314 +AUX pcsx 1273 RMD160 118f60822c2b29fec2b6b50449b6b77363570ed5 SHA1 2fd610e3ef8f6aaecf40a23138dda268f27457e9 SHA256 4b5d2f871977a3653e61d2556b82f8058aa2ebfbcb2b642aa50c2eb7bdc98b76 +MD5 dffee434d356e936aad80dafe09435c9 files/pcsx 1273 +RMD160 118f60822c2b29fec2b6b50449b6b77363570ed5 files/pcsx 1273 +SHA256 4b5d2f871977a3653e61d2556b82f8058aa2ebfbcb2b642aa50c2eb7bdc98b76 files/pcsx 1273 AUX pcsx-1.5-gcc41.patch 655 RMD160 93add45c6ffc9de17f0ddfed9d6f8916449ae64f SHA1 ea6547c2b8c099a663a6989af395928b5486de9c SHA256 6ea18e4d66272760f51ec685b2c16ba4b756837123f774fe4c8f434be0635d52 MD5 8223e33b5af7e6c6be3755e3f70c08d3 files/pcsx-1.5-gcc41.patch 655 RMD160 93add45c6ffc9de17f0ddfed9d6f8916449ae64f files/pcsx-1.5-gcc41.patch 655 SHA256 6ea18e4d66272760f51ec685b2c16ba4b756837123f774fe4c8f434be0635d52 files/pcsx-1.5-gcc41.patch 655 DIST PcsxSrc-1.5.tgz 441651 RMD160 83e6425cb027c72b5b452b61f6b5a83992c5e065 SHA1 ce7200a3ee79e04685c6fe666b1bb7e49f8a4a17 SHA256 49656115a7ade50245e54314052d2a7be814f40c50f609427fe5320eba4435a9 -EBUILD pcsx-1.5-r1.ebuild 1672 RMD160 b99e5182c54c4bd13d095c4a145fe5752a6b9253 SHA1 22963825519103a9a1dc22618906f72202fc0d69 SHA256 7ee070317a890a613322bb9854edabdf71d07348a5f98dfc5768a7cff2051d48 -MD5 c8f68cf45af7a9c049b64da26822d985 pcsx-1.5-r1.ebuild 1672 -RMD160 b99e5182c54c4bd13d095c4a145fe5752a6b9253 pcsx-1.5-r1.ebuild 1672 -SHA256 7ee070317a890a613322bb9854edabdf71d07348a5f98dfc5768a7cff2051d48 pcsx-1.5-r1.ebuild 1672 -MISC ChangeLog 2389 RMD160 479bb2d2f0ab59d747535a8eae8c1ac493865350 SHA1 562a66560f40869ee19752a2493ab741407ed490 SHA256 dfe3bf4cfa3dd038704c86ced69bd5e5306547d57e8fdc72d4d8093e428a1712 -MD5 323e2f83b5c3ece8f96552379338f293 ChangeLog 2389 -RMD160 479bb2d2f0ab59d747535a8eae8c1ac493865350 ChangeLog 2389 -SHA256 dfe3bf4cfa3dd038704c86ced69bd5e5306547d57e8fdc72d4d8093e428a1712 ChangeLog 2389 +EBUILD pcsx-1.5-r1.ebuild 1669 RMD160 38dadb8044d97aee01fb1b253803bc4d80217d31 SHA1 f9f191f259c4c07d01f2f7daf8161cbd18baf1b1 SHA256 9a3bce32cd96c470711b20b2a1ba2f5e9030d029ecb45a033aad61c0f029dde6 +MD5 3895c315adba35357b9be92ba4c38d59 pcsx-1.5-r1.ebuild 1669 +RMD160 38dadb8044d97aee01fb1b253803bc4d80217d31 pcsx-1.5-r1.ebuild 1669 +SHA256 9a3bce32cd96c470711b20b2a1ba2f5e9030d029ecb45a033aad61c0f029dde6 pcsx-1.5-r1.ebuild 1669 +MISC ChangeLog 2500 RMD160 e9fc65ae67b37ff5ee3256470450b8b78be4665b SHA1 19e6594e2a4d1a95886a0e0966c06e80466bb947 SHA256 5581dd9ed7dd591c32b49fe0994eebff8dcf36cb2f8a7b0d3adf78c45cb664e6 +MD5 65e4d9b144bfc96616b11e4d837877c0 ChangeLog 2500 +RMD160 e9fc65ae67b37ff5ee3256470450b8b78be4665b ChangeLog 2500 +SHA256 5581dd9ed7dd591c32b49fe0994eebff8dcf36cb2f8a7b0d3adf78c45cb664e6 ChangeLog 2500 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158 @@ -26,3 +29,10 @@ SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata MD5 f24d038538f42e14f4d60cd7d4430351 files/digest-pcsx-1.5-r1 226 RMD160 ff33efdb959a1871d267d5d673c73deeb6a15a8a files/digest-pcsx-1.5-r1 226 SHA256 ae47836ce270ecbfb147562d16141c3499cf1c9a59fc5f4c1db0ad8ceceec8ae files/digest-pcsx-1.5-r1 226 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.2 (GNU/Linux) + +iD8DBQFF34yadz7hIScOURERAgCXAJ9YlQilzoDlNRAthrHhRgEWmCrE2gCg1Hig +rXR+VNx2gz659JggFyWi4Is= +=2wpW +-----END PGP SIGNATURE----- diff --git a/games-emulation/pcsx/files/pcsx b/games-emulation/pcsx/files/pcsx index 0a66d5411542..106788c0c5c4 100644 --- a/games-emulation/pcsx/files/pcsx +++ b/games-emulation/pcsx/files/pcsx @@ -2,28 +2,28 @@ source /sbin/functions.sh -if [ ! -f ${HOME}/.pcsx/config ]; then +if [[ ! -f ~/.pcsx/config ]]; then einfo You are running PCSX for the first time. einfo Setting up your PCSX environment... Please wait... - mkdir -p ${HOME}/.pcsx - cd ${HOME}/.pcsx + mkdir -p ~/.pcsx + cd ~/.pcsx mkdir memcards bios cfg plugins - ln -s /usr/games/bin/pcsx.bin pcsx - ln -s /usr/games/lib/psemu/plugins/* plugins/ - ln -s /usr/share/games/pcsx .pixmaps + ln -s GAMES_BINDIR/pcsx.bin pcsx + ln -s GAMES_LIBDIR/psemu/plugins/* plugins/ + ln -s GAMES_DATADIR/pcsx .pixmaps cd bios - if [ -f /usr/games/lib/psemu/bios/scph1001.bin ]; then - ln -s /usr/games/lib/psemu/bios/scph1001.bin . + if [[ -f GAMES_LIBDIR/psemu/bios/scph1001.bin ]]; then + ln -s GAMES_LIBDIR/psemu/bios/scph1001.bin . biosname=scph1001.bin else biosname=HLE fi cd .. - cat >${HOME}/.pcsx/config <~/.pcsx/config </dev/null -ln -s /usr/games/lib/psemu/plugins/* plugins/ &>/dev/null +ln -s GAMES_LIBDIR/psemu/cfg/* cfg/ &>/dev/null +ln -s GAMES_LIBDIR/psemu/plugins/* plugins/ &>/dev/null exec ./pcsx "$@" diff --git a/games-emulation/pcsx/pcsx-1.5-r1.ebuild b/games-emulation/pcsx/pcsx-1.5-r1.ebuild index b81dcabf2928..9e3fdfc637b8 100644 --- a/games-emulation/pcsx/pcsx-1.5-r1.ebuild +++ b/games-emulation/pcsx/pcsx-1.5-r1.ebuild @@ -1,68 +1,65 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/pcsx/pcsx-1.5-r1.ebuild,v 1.9 2006/07/25 04:19:19 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/pcsx/pcsx-1.5-r1.ebuild,v 1.10 2007/02/24 00:53:40 nyhm Exp $ inherit eutils games -S=${WORKDIR}/PcsxSrc-${PV} -DESCRIPTION="Playstation emulator" +DESCRIPTION="PlayStation emulator" HOMEPAGE="http://www.pcsx.net/" SRC_URI="http://www.pcsx.net/downloads/PcsxSrc-${PV}.tgz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="x86 -ppc" +KEYWORDS="-ppc x86" IUSE="opengl" -DEPEND="sys-libs/zlib - app-arch/unzip - >=x11-libs/gtk+-2 +DEPEND=">=x11-libs/gtk+-2 gnome-base/libglade" -RDEPEND="games-emulation/psemu-cdr +RDEPEND="${DEPEND} + games-emulation/psemu-cdr games-emulation/psemu-cdriso games-emulation/psemu-padxwin games-emulation/psemu-padjoy games-emulation/psemu-peopsspu - || ( - opengl? ( x86? ( games-emulation/psemu-gpupetemesagl ) ) - games-emulation/psemu-peopssoftgpu - )" + opengl? ( games-emulation/psemu-gpupetemesagl ) + !opengl? ( games-emulation/psemu-peopssoftgpu )" + +S=${WORKDIR}/PcsxSrc-${PV} src_unpack() { - unpack PcsxSrc-${PV}.tgz + unpack ${A} cd "${S}" - edos2unix `find -regex '.*\.[ch]'` + edos2unix $(find -regex '.*\.[ch]') - epatch "${FILESDIR}"/${PV}-gentoo.patch \ - "${FILESDIR}/${P}"-gcc41.patch + epatch \ + "${FILESDIR}"/${PV}-gentoo.patch \ + "${FILESDIR}"/${P}-gcc41.patch sed -i \ -e "s:Plugin/:${GAMES_LIBDIR}/psemu/plugins/:" \ -e "s:Bios/:${GAMES_LIBDIR}/psemu/bios/:" \ -e 's:Pcsx.cfg:~/.pcsx/config:' \ Linux/LnxMain.c \ || die "sed LnxMain.c failed" - if [ "${ARCH}" = "ppc" ]; then - sed -i \ - -e "s:^CPU\ =.*:CPU = powerpc:" Linux/Makefile \ - || die "sed Linux/Makefile failed" - sed -i \ - -e "s:__LINUX__:__i386__:g" Gte.c \ - || die "sed Gte.c failed" - fi + sed \ + -e "s:GAMES_DATADIR:${GAMES_DATADIR}:" \ + -e "s:GAMES_LIBDIR:${GAMES_LIBDIR}:" \ + -e "s:GAMES_BINDIR:${GAMES_BINDIR}:" \ + "${FILESDIR}"/pcsx > "${T}"/pcsx \ + || die "sed failed" } src_compile() { cd Linux - econf || die "econf failed" + egamesconf || die emake OPTIMIZE="${CFLAGS}" STRIP=true || die "emake failed" } src_install() { - newgamesbin Linux/pcsx pcsx.bin - dogamesbin "${FILESDIR}"/pcsx + newgamesbin Linux/pcsx pcsx.bin || die "newgamesbin failed" + dogamesbin "${T}"/pcsx || die "dogamesbin failed" insinto "${GAMES_DATADIR}"/${PN} - doins Linux/.pixmaps/* + doins Linux/.pixmaps/* || die "doins failed" dodoc Docs/* prepgamesdirs }