From: Tristan Heaven Date: Wed, 14 Feb 2007 01:06:08 +0000 (+0000) Subject: Move icon to mirror://gentoo X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f7e4027abedfe1598b48b676a88030ef28f310f0;p=gentoo.git Move icon to mirror://gentoo Package-Manager: portage-2.1.2-r9 --- diff --git a/games-fps/prboom/ChangeLog b/games-fps/prboom/ChangeLog index e9408c01b2f1..c51cd85f4e90 100644 --- a/games-fps/prboom/ChangeLog +++ b/games-fps/prboom/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-fps/prboom # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/prboom/ChangeLog,v 1.25 2007/01/10 00:21:19 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/prboom/ChangeLog,v 1.26 2007/02/14 01:06:08 nyhm Exp $ + + 14 Feb 2007; Tristan Heaven -files/prboom.png, + prboom-2.4.7.ebuild: + Move icon to mirror://gentoo 10 Jan 2007; Chris Gianelloni -files/2.4.2-nvidia.patch, -files/2.4.2-nvidia-test.c, diff --git a/games-fps/prboom/Manifest b/games-fps/prboom/Manifest index eb58595c8fa8..83bc277f3d1e 100644 --- a/games-fps/prboom/Manifest +++ b/games-fps/prboom/Manifest @@ -1,11 +1,6 @@ -AUX 2.4.6-nvidia-test.c 90 RMD160 423a4874c8c9c92482b7df72cb88f5140ebbbd5c SHA1 dc9d0930e6f0ca7826554101e4d54a3405bb6f34 SHA256 5df0930928328c700cafba8ac3367dc799118dddcd16d71d2bb0d65eb3a2d185 -MD5 6baf3ffdd34dfe4b85618dd603616a80 files/2.4.6-nvidia-test.c 90 -RMD160 423a4874c8c9c92482b7df72cb88f5140ebbbd5c files/2.4.6-nvidia-test.c 90 -SHA256 5df0930928328c700cafba8ac3367dc799118dddcd16d71d2bb0d65eb3a2d185 files/2.4.6-nvidia-test.c 90 -AUX 2.4.6-nvidia.patch 1734 RMD160 89aeec2e42cc8dc29d1dd79f17fd91abe77ceb44 SHA1 5cd90ca85012d2d1ffb703861dcb9d9ff92b2388 SHA256 db77ce8107f97f2886d89c53777b2f9c7ef5e2559dcdd4ea455f3cf0ae2491fe -MD5 a20d23cae8e179f4d2b3e7d30f55cf2d files/2.4.6-nvidia.patch 1734 -RMD160 89aeec2e42cc8dc29d1dd79f17fd91abe77ceb44 files/2.4.6-nvidia.patch 1734 -SHA256 db77ce8107f97f2886d89c53777b2f9c7ef5e2559dcdd4ea455f3cf0ae2491fe files/2.4.6-nvidia.patch 1734 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX 2.4.7-nvidia-test.c 90 RMD160 423a4874c8c9c92482b7df72cb88f5140ebbbd5c SHA1 dc9d0930e6f0ca7826554101e4d54a3405bb6f34 SHA256 5df0930928328c700cafba8ac3367dc799118dddcd16d71d2bb0d65eb3a2d185 MD5 6baf3ffdd34dfe4b85618dd603616a80 files/2.4.7-nvidia-test.c 90 RMD160 423a4874c8c9c92482b7df72cb88f5140ebbbd5c files/2.4.7-nvidia-test.c 90 @@ -14,31 +9,27 @@ AUX 2.4.7-nvidia.patch 1734 RMD160 89aeec2e42cc8dc29d1dd79f17fd91abe77ceb44 SHA1 MD5 a20d23cae8e179f4d2b3e7d30f55cf2d files/2.4.7-nvidia.patch 1734 RMD160 89aeec2e42cc8dc29d1dd79f17fd91abe77ceb44 files/2.4.7-nvidia.patch 1734 SHA256 db77ce8107f97f2886d89c53777b2f9c7ef5e2559dcdd4ea455f3cf0ae2491fe files/2.4.7-nvidia.patch 1734 -AUX prboom.png 4254 RMD160 a673654eab9d87d34537e3d42c9274245be9e45f SHA1 c8e6a60b76ae93c44c5508ce5cb1308831c474a7 SHA256 ed79c4712b57b0c5e8ef975412e22d6936fa4b62657707e8f1cda63302008542 -MD5 ffbfee35e7a2580f5f0cdadcb05132e0 files/prboom.png 4254 -RMD160 a673654eab9d87d34537e3d42c9274245be9e45f files/prboom.png 4254 -SHA256 ed79c4712b57b0c5e8ef975412e22d6936fa4b62657707e8f1cda63302008542 files/prboom.png 4254 -DIST prboom-2.4.6.tar.gz 997997 RMD160 07370e5dc42c938b275cb0c1bb1e50dd0ce096d5 SHA1 00486df7aaf72c164767adeaa01c083401c44b30 SHA256 70bf0884213b7d806a4cdf40d39bcc638e8ccf99e67e95229ef079108cd30564 DIST prboom-2.4.7.tar.gz 999524 RMD160 78c8548954dd95469f8099bc8fa697f62a69c17e SHA1 52aeb933db770b48331317dc357f6cbad3085600 SHA256 de22dbaacd25a0f0b16c507aa2326a90b7f5dcfcf862c3dc7076996c6187cd2f -EBUILD prboom-2.4.6.ebuild 1811 RMD160 6a06ebfe480aa819c9bcc1c216ec9a2f4024162b SHA1 4f81b9cc00e392f11090e228c81fc8881d24a561 SHA256 6efa9c1fff20e18912f1b38dbb8bc0f2ef66bdea111f62fc34e8de8fa77e8822 -MD5 52b2ca6a85308b4db547d396ac07a5bd prboom-2.4.6.ebuild 1811 -RMD160 6a06ebfe480aa819c9bcc1c216ec9a2f4024162b prboom-2.4.6.ebuild 1811 -SHA256 6efa9c1fff20e18912f1b38dbb8bc0f2ef66bdea111f62fc34e8de8fa77e8822 prboom-2.4.6.ebuild 1811 -EBUILD prboom-2.4.7.ebuild 1811 RMD160 6b6e35740ec79e81b7392415b43eb9c9ba747eb8 SHA1 e25ae3faa8ffb522daef76bfec647bc308540250 SHA256 515868febbbafaf5cb54fff8c20744e74974f8cf0355026c676ee23e4da03083 -MD5 0c247c72d0caedbfd3ed3eab6ffa7e89 prboom-2.4.7.ebuild 1811 -RMD160 6b6e35740ec79e81b7392415b43eb9c9ba747eb8 prboom-2.4.7.ebuild 1811 -SHA256 515868febbbafaf5cb54fff8c20744e74974f8cf0355026c676ee23e4da03083 prboom-2.4.7.ebuild 1811 -MISC ChangeLog 4600 RMD160 8122680c8f92e8e7d9208b42ab83d76f989c5134 SHA1 d363dd7b2faad9e869772e51bac495d9cda484a7 SHA256 adddab6ba5e61539cd1fc3caa1749dc63352d83737b7683038a6a81f65d7f34f -MD5 e33e832e92d17ea3a9b9e64d75db0f9d ChangeLog 4600 -RMD160 8122680c8f92e8e7d9208b42ab83d76f989c5134 ChangeLog 4600 -SHA256 adddab6ba5e61539cd1fc3caa1749dc63352d83737b7683038a6a81f65d7f34f ChangeLog 4600 +DIST prboom.png 4254 RMD160 a673654eab9d87d34537e3d42c9274245be9e45f SHA1 c8e6a60b76ae93c44c5508ce5cb1308831c474a7 SHA256 ed79c4712b57b0c5e8ef975412e22d6936fa4b62657707e8f1cda63302008542 +EBUILD prboom-2.4.7.ebuild 1921 RMD160 f0eb21c5f4e6d2999d08f5bf5d723354a40051a2 SHA1 2e91c3cc2912f2015435e62a4159b0616578af23 SHA256 92ab32764655cf79a5fed0e4e563eb9f94f590ef08ac35e2aaed65cd0a89ec0c +MD5 26c0d9e68f815a766ff830757a9396a6 prboom-2.4.7.ebuild 1921 +RMD160 f0eb21c5f4e6d2999d08f5bf5d723354a40051a2 prboom-2.4.7.ebuild 1921 +SHA256 92ab32764655cf79a5fed0e4e563eb9f94f590ef08ac35e2aaed65cd0a89ec0c prboom-2.4.7.ebuild 1921 +MISC ChangeLog 4718 RMD160 61d48df466808cef77c1cd3018793a5f27d34983 SHA1 118128ebe7068dfa92967a250251604f26e3111a SHA256 f1cf4aa9aa335224ff097e5675b4b7d6bf5b0d9f28657da80c9f550195111358 +MD5 04e85c51ee465a6df950534514a6c6e1 ChangeLog 4718 +RMD160 61d48df466808cef77c1cd3018793a5f27d34983 ChangeLog 4718 +SHA256 f1cf4aa9aa335224ff097e5675b4b7d6bf5b0d9f28657da80c9f550195111358 ChangeLog 4718 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158 -MD5 50e7551445b8d33cb81ec36ee49f6ae6 files/digest-prboom-2.4.6 238 -RMD160 256753c3a9432d429bf69a340bfe26c92b4a1920 files/digest-prboom-2.4.6 238 -SHA256 cafa1d8a8822494caf8218429aa4add77a21112e42edc2222f18dc20c64882a9 files/digest-prboom-2.4.6 238 -MD5 056c7b4c0d0ec00442ac41333c1998a7 files/digest-prboom-2.4.7 238 -RMD160 d294a4142079a7670a3eb873e8cbfd8131a8629a files/digest-prboom-2.4.7 238 -SHA256 6f631acd7e525a7440609aaa0189847243ef0069749768e885982d9506c67577 files/digest-prboom-2.4.7 238 +MD5 dee71eb79da94e3e694089bc93fabc02 files/digest-prboom-2.4.7 443 +RMD160 21a54d4df1013b568124b531da5b36411d010b21 files/digest-prboom-2.4.7 443 +SHA256 2708f481ec8f80fc2a840b7bca6426eaebd20fe43a94b556e0756094c3ae23c8 files/digest-prboom-2.4.7 443 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.2 (GNU/Linux) + +iD8DBQFF0mCIdz7hIScOURERAtpoAKDX88J0anjoXaWNhXnfclP74MREYACfcZwy +LPlFDUE64RY7kppZU3BKcF0= +=mhC4 +-----END PGP SIGNATURE----- diff --git a/games-fps/prboom/files/2.4.6-nvidia-test.c b/games-fps/prboom/files/2.4.6-nvidia-test.c deleted file mode 100644 index f9e4bd700f8a..000000000000 --- a/games-fps/prboom/files/2.4.6-nvidia-test.c +++ /dev/null @@ -1,3 +0,0 @@ -#include -PFNGLCOLORTABLEEXTPROC glColorTableEXT; -int main(){return 0;} diff --git a/games-fps/prboom/files/2.4.6-nvidia.patch b/games-fps/prboom/files/2.4.6-nvidia.patch deleted file mode 100644 index 2b7aa9b32d46..000000000000 --- a/games-fps/prboom/files/2.4.6-nvidia.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- src/gl_intern.h.orig 2003-09-21 16:39:30.247451624 -0400 -+++ src/gl_intern.h 2003-09-21 16:39:41.610724144 -0400 -@@ -84,6 +84,6 @@ - #define min(a,b) ((a)<(b)?(a):(b)) - #endif - --PFNGLCOLORTABLEEXTPROC gld_ColorTableEXT; -+//PFNGLCOLORTABLEEXTPROC gld_ColorTableEXT; - - #endif // _GL_INTERN_H ---- src/gl_main.c.orig 2003-09-21 16:39:55.436622288 -0400 -+++ src/gl_main.c 2003-09-21 16:43:00.943420968 -0400 -@@ -285,6 +285,7 @@ - - if (strcasecmp(extension, "GL_EXT_texture_filter_anisotropic") == 0) - gl_texture_filter_anisotropic = true; -+/* - else if (strcasecmp(extension, "GL_EXT_paletted_texture") == 0) { - if (gl_use_paletted_texture) { - gl_paletted_texture = true; -@@ -304,6 +305,7 @@ - else - lprintf(LO_INFO,"using GL_EXT_shared_texture_palette\n",glGetString(GL_VENDOR)); - } -+*/ - - extension = p; - } while (*extension != '\0'); -@@ -761,7 +763,7 @@ - pal[transparent_pal_index*4+1]=0; - pal[transparent_pal_index*4+2]=0; - pal[transparent_pal_index*4+3]=0; -- gld_ColorTableEXT(GL_SHARED_TEXTURE_PALETTE_EXT, GL_RGBA, 256, GL_RGBA, GL_UNSIGNED_BYTE, pal); -+// gld_ColorTableEXT(GL_SHARED_TEXTURE_PALETTE_EXT, GL_RGBA, 256, GL_RGBA, GL_UNSIGNED_BYTE, pal); - W_UnlockLumpName("PLAYPAL"); - } else { - if (palette>0) ---- src/gl_texture.c.orig 2003-09-21 16:43:18.450759448 -0400 -+++ src/gl_texture.c 2003-09-21 16:43:39.549551944 -0400 -@@ -178,7 +178,7 @@ - pal[transparent_pal_index*4+1]=0; - pal[transparent_pal_index*4+2]=0; - pal[transparent_pal_index*4+3]=0; -- gld_ColorTableEXT(target, GL_RGBA, 256, GL_RGBA, GL_UNSIGNED_BYTE, pal); -+// gld_ColorTableEXT(target, GL_RGBA, 256, GL_RGBA, GL_UNSIGNED_BYTE, pal); - W_UnlockLumpName("PLAYPAL"); - } - diff --git a/games-fps/prboom/files/digest-prboom-2.4.6 b/games-fps/prboom/files/digest-prboom-2.4.6 deleted file mode 100644 index 442454c04e12..000000000000 --- a/games-fps/prboom/files/digest-prboom-2.4.6 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 0f60f3ad6a8dad5b2c6d4360f181ac22 prboom-2.4.6.tar.gz 997997 -RMD160 07370e5dc42c938b275cb0c1bb1e50dd0ce096d5 prboom-2.4.6.tar.gz 997997 -SHA256 70bf0884213b7d806a4cdf40d39bcc638e8ccf99e67e95229ef079108cd30564 prboom-2.4.6.tar.gz 997997 diff --git a/games-fps/prboom/files/digest-prboom-2.4.7 b/games-fps/prboom/files/digest-prboom-2.4.7 index 87c3aa83a94f..ccb28c37fcbe 100644 --- a/games-fps/prboom/files/digest-prboom-2.4.7 +++ b/games-fps/prboom/files/digest-prboom-2.4.7 @@ -1,3 +1,6 @@ MD5 9942f521764d7f89df2218a456da4f02 prboom-2.4.7.tar.gz 999524 RMD160 78c8548954dd95469f8099bc8fa697f62a69c17e prboom-2.4.7.tar.gz 999524 SHA256 de22dbaacd25a0f0b16c507aa2326a90b7f5dcfcf862c3dc7076996c6187cd2f prboom-2.4.7.tar.gz 999524 +MD5 ffbfee35e7a2580f5f0cdadcb05132e0 prboom.png 4254 +RMD160 a673654eab9d87d34537e3d42c9274245be9e45f prboom.png 4254 +SHA256 ed79c4712b57b0c5e8ef975412e22d6936fa4b62657707e8f1cda63302008542 prboom.png 4254 diff --git a/games-fps/prboom/files/prboom.png b/games-fps/prboom/files/prboom.png deleted file mode 100644 index 5541436f96ea..000000000000 Binary files a/games-fps/prboom/files/prboom.png and /dev/null differ diff --git a/games-fps/prboom/prboom-2.4.6.ebuild b/games-fps/prboom/prboom-2.4.6.ebuild deleted file mode 100644 index ddc72a495a4c..000000000000 --- a/games-fps/prboom/prboom-2.4.6.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/prboom/prboom-2.4.6.ebuild,v 1.3 2007/01/26 22:54:06 mr_bones_ Exp $ - -inherit eutils toolchain-funcs games - -DESCRIPTION="Port of ID's doom to SDL and OpenGL" -HOMEPAGE="http://prboom.sourceforge.net/" -SRC_URI="mirror://sourceforge/prboom/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc sparc x86" -IUSE="opengl" - -DEPEND=">=media-libs/libsdl-1.1.3 - media-libs/sdl-mixer - media-libs/sdl-net - !games-fps/lsdldoom - opengl? ( virtual/opengl virtual/glu )" - -src_unpack() { - unpack ${A} - cd "${S}" - ebegin "Detecting NVidia GL/prboom bug" - $(tc-getCC) "${FILESDIR}"/${PV}-nvidia-test.c 2> /dev/null - local ret=$? - eend ${ret} "NVidia GL/prboom bug found ;(" - [ ${ret} -eq 0 ] || epatch "${FILESDIR}"/${PV}-nvidia.patch - sed -i \ - -e '/^gamesdir/ s/\/games/\/bin/' \ - src/Makefile.in \ - || die "sed failed" - sed -i \ - -e 's/: install-docDATA/:/' \ - -e '/^SUBDIRS/ s/doc//' \ - Makefile.in \ - || die "sed failed" -} - -src_compile() { - local myconf - # configure.in should be fixed as - # --enable-gl and - # --disable-gl are treated the same - use opengl && myconf="--enable-gl" - # leave --disable-cpu-opt in otherwise the configure script - # will append -march=i686 and crap ... let the user's CFLAGS - # handle this ... - egamesconf \ - --disable-dependency-tracking \ - ${myconf} \ - $(use_enable x86 i386-asm) \ - --disable-cpu-opt \ - --with-waddir="${GAMES_DATADIR}/doom-data" \ - || die - emake || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - doman doc/*.{5,6} - dodoc AUTHORS NEWS README TODO doc/README.* doc/*.txt - doicon "${FILESDIR}/${PN}.png" - make_desktop_entry ${PN} "PrBoom" - prepgamesdirs -} diff --git a/games-fps/prboom/prboom-2.4.7.ebuild b/games-fps/prboom/prboom-2.4.7.ebuild index 1892d5eb822a..08961abb23c7 100644 --- a/games-fps/prboom/prboom-2.4.7.ebuild +++ b/games-fps/prboom/prboom-2.4.7.ebuild @@ -1,23 +1,27 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/prboom/prboom-2.4.7.ebuild,v 1.3 2007/01/26 22:54:06 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/prboom/prboom-2.4.7.ebuild,v 1.4 2007/02/14 01:06:08 nyhm Exp $ inherit eutils toolchain-funcs games DESCRIPTION="Port of ID's doom to SDL and OpenGL" HOMEPAGE="http://prboom.sourceforge.net/" -SRC_URI="mirror://sourceforge/prboom/${P}.tar.gz" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz + mirror://gentoo/${PN}.png" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ~ppc sparc x86" IUSE="opengl" -DEPEND=">=media-libs/libsdl-1.1.3 +DEPEND="media-libs/libsdl media-libs/sdl-mixer media-libs/sdl-net !games-fps/lsdldoom - opengl? ( virtual/opengl virtual/glu )" + opengl? ( + virtual/opengl + virtual/glu + )" src_unpack() { unpack ${A} @@ -36,6 +40,10 @@ src_unpack() { -e '/^SUBDIRS/ s/doc//' \ Makefile.in \ || die "sed failed" + sed -i \ + -e 's:-ffast-math $CFLAGS_OPT::' \ + configure \ + || die "sed configure failed" } src_compile() { @@ -61,7 +69,7 @@ src_install() { emake DESTDIR="${D}" install || die "emake install failed" doman doc/*.{5,6} dodoc AUTHORS NEWS README TODO doc/README.* doc/*.txt - doicon "${FILESDIR}/${PN}.png" + doicon "${DISTDIR}"/${PN}.png make_desktop_entry ${PN} "PrBoom" prepgamesdirs }