From: Tristan Heaven Date: Sat, 3 Feb 2007 08:01:50 +0000 (+0000) Subject: cleanup X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=913ee2d9fc275b11abdce1ea2d680359400aad88;p=gentoo.git cleanup Package-Manager: portage-2.1.2-r6 --- diff --git a/games-emulation/generator/Manifest b/games-emulation/generator/Manifest index a3d420672190..ba890d17e269 100644 --- a/games-emulation/generator/Manifest +++ b/games-emulation/generator/Manifest @@ -5,25 +5,16 @@ AUX generator-0.35-execstacks.patch 563 RMD160 046b18fd6bbea01ccad03fadbb445f02f MD5 cfbede23add691a37dbdfad5a6015d09 files/generator-0.35-execstacks.patch 563 RMD160 046b18fd6bbea01ccad03fadbb445f02ff3833a5 files/generator-0.35-execstacks.patch 563 SHA256 0a73e832c5718d5d548d123756c3d6a803c6d62b32ab13290809e6b6e420712c files/generator-0.35-execstacks.patch 563 -AUX generator-0.35-gcc.patch 1150 RMD160 642993e8402233b75c3c18a1e0b17f8e7f1cb505 SHA1 3f42ce47754c5af68f0ad91db92cb91891684886 SHA256 18422a088e48d869ef8739a6725d48669a6035286e880e524c2d53e14da03b08 -MD5 a595c37807cc4c11cbdc8930dffacc34 files/generator-0.35-gcc.patch 1150 -RMD160 642993e8402233b75c3c18a1e0b17f8e7f1cb505 files/generator-0.35-gcc.patch 1150 -SHA256 18422a088e48d869ef8739a6725d48669a6035286e880e524c2d53e14da03b08 files/generator-0.35-gcc.patch 1150 AUX netbsd-gcc-3.3.patch 1345 RMD160 94d4d22321c81248f8b12c24389e517fe448b7a6 SHA1 6bc259408bb02411c014b9d146ab33e7237ddad4 SHA256 1cbc8749da616ebe356364a7730bbb7f1832456742dff6192ea9e152fa6ba906 MD5 9ad78ba06412ba4a6b57b93e759e1016 files/netbsd-gcc-3.3.patch 1345 RMD160 94d4d22321c81248f8b12c24389e517fe448b7a6 files/netbsd-gcc-3.3.patch 1345 SHA256 1cbc8749da616ebe356364a7730bbb7f1832456742dff6192ea9e152fa6ba906 files/netbsd-gcc-3.3.patch 1345 DIST generator-0.35-cbiere-r2.tar.bz2 446101 RMD160 394145e32f3bf61ac4ed5fa21d2873978c5bd341 SHA1 bb329925298ef7a087601e61f570af8d4e615915 SHA256 10da28fc5eb77e3a7d54e6b9d08a0630d3effedd0576dd1767ff5f74f57f2a17 -DIST generator-0.35-cbiere.tar.bz2 454740 RMD160 4bb53827645fdba237f08d9b60d01d8eccf05b10 SHA1 a0df1313e18f32a12420b6bbeef28f4e4a037129 SHA256 93ded1b0b3e61b729382c1bb143b8021b195264745c483650178f16ebb681fc1 DIST generator-0.35.tar.gz 469541 RMD160 6b448018b8ed0fd9755ddb850f48892304d12e78 SHA1 a61138579efd97028d3a69c54c3c6fcd0a3d74ab SHA256 5e622e4234125eeea9bc6fa2759f8cdf42844092bdb007d4a43f55c40c4cd7f5 -EBUILD generator-0.35-r2.ebuild 1704 RMD160 c3d746f489cd6a6371d10bca1c6786615ebb701a SHA1 6efee241fcb2d368ef8d849602c5596d892e2328 SHA256 410bd6fa0488b3f460f3470eda4c928b44464c17f8f5ed61f4b1809dd8676342 -MD5 8d00edc1b92ebb3f76b3ac5b5d863b01 generator-0.35-r2.ebuild 1704 -RMD160 c3d746f489cd6a6371d10bca1c6786615ebb701a generator-0.35-r2.ebuild 1704 -SHA256 410bd6fa0488b3f460f3470eda4c928b44464c17f8f5ed61f4b1809dd8676342 generator-0.35-r2.ebuild 1704 -EBUILD generator-0.35-r3.ebuild 1625 RMD160 82d084ea540d05ab7de63f4b9726a771e941aa6d SHA1 51384ba5ed018595b345716141a476d33f32b4ef SHA256 f027f829592f6c36eb45dbd433b78aa087e826fd1217d09c185802d5a33d2f61 -MD5 a49172a9884b9ef24c605be128dc0cb9 generator-0.35-r3.ebuild 1625 -RMD160 82d084ea540d05ab7de63f4b9726a771e941aa6d generator-0.35-r3.ebuild 1625 -SHA256 f027f829592f6c36eb45dbd433b78aa087e826fd1217d09c185802d5a33d2f61 generator-0.35-r3.ebuild 1625 +EBUILD generator-0.35-r3.ebuild 1594 RMD160 07f5568659019713192d56fa9563a0fe39a9b756 SHA1 fdbd28ca29085ef147954ae889f0f415bd88b770 SHA256 95269c29b4903677412e5eecf5eb45889f26e81a9b3661b625a94af74ddef1ce +MD5 4b6bd8101023206d7fc7898f7297c597 generator-0.35-r3.ebuild 1594 +RMD160 07f5568659019713192d56fa9563a0fe39a9b756 generator-0.35-r3.ebuild 1594 +SHA256 95269c29b4903677412e5eecf5eb45889f26e81a9b3661b625a94af74ddef1ce generator-0.35-r3.ebuild 1594 EBUILD generator-0.35.ebuild 1715 RMD160 9bda4d175eef2483da7cb79fbafdae9533a76494 SHA1 c293f50f2194694bcc05e89dba87236b9f3d3a49 SHA256 d29f8423b4bc0fbd51c274f4bee6d1fd7ae38b0fda5cc2a3d2b8c446153f4b85 MD5 6df3cd92ab5dca7c35416dfb961cfffe generator-0.35.ebuild 1715 RMD160 9bda4d175eef2483da7cb79fbafdae9533a76494 generator-0.35.ebuild 1715 @@ -39,16 +30,13 @@ SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata MD5 667fba2b5f5659517031064f9654b0ec files/digest-generator-0.35 244 RMD160 11220bd4156fa417b09f10fa250325d5f37e575d files/digest-generator-0.35 244 SHA256 d64cc6fa39a62a23a842102782bc39cc69e6dee76f0ca1c864070a87e425b887 files/digest-generator-0.35 244 -MD5 ff7a8432caed77851c8d8e189a754e8f files/digest-generator-0.35-r2 268 -RMD160 48fd2f473fe4896a05c7ff970cd0b7c681418fc6 files/digest-generator-0.35-r2 268 -SHA256 ac0ab0054952af5117de70ecf7039c60ddd3b2bfa21dd901f5a626b51ababbaf files/digest-generator-0.35-r2 268 MD5 f56926056560ebc91a002761911d554a files/digest-generator-0.35-r3 277 RMD160 192b34e99e0bcf01ae4a45dde32e8a94ca4aee63 files/digest-generator-0.35-r3 277 SHA256 258e370f5aa5701dbde2a704bdd080c33aace03c50b0a2beeb1817be10549c15 files/digest-generator-0.35-r3 277 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) +Version: GnuPG v2.0.2 (GNU/Linux) -iD8DBQFFdvq+kT4lNIS36YERAkqJAJ0Vj2zWkM5VjTctgSHIuBDoJk00ygCdGP8p -QsfsMGt0IEf5SuqDZm8hV+U= -=SiNs +iD8DBQFFxEF1dz7hIScOURERAu4lAKD5wRDTqQsA5CkF8eYROk/E4w5G9QCeP1SI +DVWVAuC7qJqCs0WWeVd3dkA= +=W3up -----END PGP SIGNATURE----- diff --git a/games-emulation/generator/files/digest-generator-0.35-r2 b/games-emulation/generator/files/digest-generator-0.35-r2 deleted file mode 100644 index b386cf282598..000000000000 --- a/games-emulation/generator/files/digest-generator-0.35-r2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 bce3326c165d74e8a00e50355b653e08 generator-0.35-cbiere.tar.bz2 454740 -RMD160 4bb53827645fdba237f08d9b60d01d8eccf05b10 generator-0.35-cbiere.tar.bz2 454740 -SHA256 93ded1b0b3e61b729382c1bb143b8021b195264745c483650178f16ebb681fc1 generator-0.35-cbiere.tar.bz2 454740 diff --git a/games-emulation/generator/files/generator-0.35-gcc.patch b/games-emulation/generator/files/generator-0.35-gcc.patch deleted file mode 100644 index e4c56e6a9865..000000000000 --- a/games-emulation/generator/files/generator-0.35-gcc.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- cmz80/z80stb.h -+++ cmz80/z80stb.h -@@ -128,8 +128,6 @@ - /* inline */ BYTE Srl(BYTE b); - /* inline */ BYTE Sla(BYTE b); - /* inline */ BYTE Sra(BYTE b); --/* inline */ BYTE Inc(BYTE b); --/* inline */ BYTE Dec(BYTE b); - - /* inline */ WORD Add_2(WORD wArg1, WORD wArg2); - /* inline */ WORD Adc_2(WORD wArg1, WORD wArg2); ---- cpu68k/def68k.c -+++ cpu68k/def68k.c -@@ -1318,7 +1318,7 @@ - } /* block */ - } - --int clocks_movetable[] = { -+static int clocks_movetable[] = { - 4, 4, 8, 8, 8, 12, 14, 12, 16, - 4, 4, 8, 8, 8, 12, 14, 12, 16, - 8, 8, 12, 12, 12, 16, 18, 16, 20, ---- raze/Makefile.in.old 2006-09-03 03:17:39.000000000 +0200 -+++ raze/Makefile.in 2006-09-03 03:16:36.000000000 +0200 -@@ -343,6 +343,10 @@ - raze: raze.o - raze.o: raze.asm raze.reg - nasm -e raze.asm -o raze2.asm -+ echo "%ifidn __OUTPUT_FORMAT__,elf" >> raze2.asm -+ echo "section .note.GNU-stack noalloc noexec nowrite progbits" \ -+ >> raze2.asm -+ echo "%endif" >> raze2.asm - nasm -f @ASMOUTPUT@ raze2.asm -o raze.o -praze.reg - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/games-emulation/generator/generator-0.35-r2.ebuild b/games-emulation/generator/generator-0.35-r2.ebuild deleted file mode 100644 index 72b766417f39..000000000000 --- a/games-emulation/generator/generator-0.35-r2.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/generator/generator-0.35-r2.ebuild,v 1.2 2006/12/06 17:15:36 wolf31o2 Exp $ - -inherit eutils toolchain-funcs games - -DESCRIPTION="Sega Genesis / Mega Drive console emulator" -HOMEPAGE="http://www.ghostwhitecrab.com/generator/" -SRC_URI="http://www.ghostwhitecrab.com/generator/${P}-cbiere.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="svga gtk" - -S=${WORKDIR}/${P}-cbiere - -RDEPEND="media-libs/jpeg - gtk? ( =x11-libs/gtk+-1* media-libs/libsdl ) - svga? ( media-libs/svgalib )" -DEPEND="${RDEPEND} - x86? ( dev-lang/nasm )" - -src_unpack() { - unpack ${A} - cd "${S}" - mkdir my-bins - - epatch "${FILESDIR}"/${P}-gcc.patch - - sed -i \ - -e '/CFLAGS.*-O3/d' \ - -e 's/-minline-all-stringops//g' \ - configure || die "sed configure failed" - - if [[ $(gcc-major-version) -eq 3 ]] ; then - sed -i \ - -e "s/-malign-functions/-falign-functions/" \ - -e "s/-malign-loops/-falign-loops/" \ - -e "s/-malign-jumps/-falign-jumps/" \ - configure || die "sed configure failed" - fi -} - -src_compile() { - local myconf="--with-gcc=$(gcc-major-version)" - local mygui myguis - - use x86 \ - && myconf="${myconf} --with-raze" \ - || myconf="${myconf} --with-cmz80" - - use gtk && myguis="gtk" - use svga && myguis="svgalib" - - for mygui in ${myguis:-gtk} ; do - [[ -f Makefile ]] && make -s clean - egamesconf \ - ${myconf} \ - --with-${mygui} || die - emake -j1 || die "building ${mygui}" - mv main/generator-${mygui} my-bins/ - done -} - -src_install() { - dogamesbin my-bins/* || die "dogamesbin failed" - dodoc AUTHORS ChangeLog NEWS README TODO - prepgamesdirs -} diff --git a/games-emulation/generator/generator-0.35-r3.ebuild b/games-emulation/generator/generator-0.35-r3.ebuild index 79e5250432dd..dcba5b7dfe4e 100644 --- a/games-emulation/generator/generator-0.35-r3.ebuild +++ b/games-emulation/generator/generator-0.35-r3.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/generator/generator-0.35-r3.ebuild,v 1.2 2007/02/03 08:01:50 nyhm Exp $ -inherit eutils toolchain-funcs flag-o-matic games +inherit eutils toolchain-funcs games DESCRIPTION="Sega Genesis / Mega Drive emulator" HOMEPAGE="http://www.ghostwhitecrab.com/generator/" @@ -11,9 +11,9 @@ SRC_URI="http://www.ghostwhitecrab.com/generator/${P}-cbiere-r2.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -IUSE="svga gtk sdlaudio" +IUSE="gtk sdlaudio svga" -S="${WORKDIR}/${P}-cbiere-r2" +S=${WORKDIR}/${P}-cbiere-r2 RDEPEND="media-libs/jpeg media-libs/libsdl @@ -46,9 +46,6 @@ src_compile() { use gtk && myguis="${myguis} gtk" use svga && myguis="${myguis} svgalib" - # these are removed from configure by the sed above - use x86 && append-flags -ffast-math -fomit-frame-pointer - for mygui in ${myguis}; do [[ -f Makefile ]] && make -s clean egamesconf \ @@ -56,7 +53,7 @@ src_compile() { --with-${mygui} \ --with-gcc=$(gcc-major-version) \ $(use_with sdlaudio sdl-audio) \ - --disable-dependency-tracking || die "econf failed" + --disable-dependency-tracking || die emake -j1 || die "building ${mygui}" mv main/generator-${mygui} my-bins/ done