From: Michael Sterrett Date: Wed, 14 Mar 2007 18:19:32 +0000 (+0000) Subject: add patch to compile with gcc4 from Necoro d.M via bug #147086 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c9d89bcfcc4e27bd34b71c60d3e97d81d55d02f4;p=gentoo.git add patch to compile with gcc4 from Necoro d.M via bug #147086 Package-Manager: portage-2.1.2.2 --- diff --git a/games-roguelike/noegnud-nethack/ChangeLog b/games-roguelike/noegnud-nethack/ChangeLog index ea1c779e1a81..23d423ec84d3 100644 --- a/games-roguelike/noegnud-nethack/ChangeLog +++ b/games-roguelike/noegnud-nethack/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for games-roguelike/noegnud-nethack # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-roguelike/noegnud-nethack/ChangeLog,v 1.9 2007/02/08 21:24:16 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-roguelike/noegnud-nethack/ChangeLog,v 1.10 2007/03/14 18:19:31 mr_bones_ Exp $ + + 14 Mar 2007; Michael Sterrett + +files/noegnud-nethack-0.8.2-gcc41.patch, + +files/noegnud-nethack-0.8.3-gcc41.patch, -noegnud-nethack-0.7.1.ebuild, + noegnud-nethack-0.8.2.ebuild, noegnud-nethack-0.8.3.ebuild: + add patch to compile with gcc4 from Necoro d.M via bug #147086 08 Feb 2007; Chris Gianelloni ChangeLog: Regenerate digest in Manifest2 format. diff --git a/games-roguelike/noegnud-nethack/Manifest b/games-roguelike/noegnud-nethack/Manifest index 4ce862c54565..f929b8438d73 100644 --- a/games-roguelike/noegnud-nethack/Manifest +++ b/games-roguelike/noegnud-nethack/Manifest @@ -1,45 +1,34 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -DIST nethack-341.tgz 3492419 RMD160 d28255e76248a8658b4c08e9d55a849dd6572b17 SHA1 91eec5d20fb0fe676f92e1149e3b0360470aef77 SHA256 c431c88788646751b72db75301468a4b2094ac0fddd0f9a1eec55df72013a51f +AUX noegnud-nethack-0.8.2-gcc41.patch 595 RMD160 ceeceb9ef8d7e386cb1e2d314a0e6d7d77761987 SHA1 924664d5aa93a7f0233022bd63fde4ac85e0952f SHA256 fd8e7afb1f36775b0d042031c14e194b875eff01db8cfc929e63a6eccabb66e7 +MD5 66aea45f1586f38fc4696cc34e8ef1d9 files/noegnud-nethack-0.8.2-gcc41.patch 595 +RMD160 ceeceb9ef8d7e386cb1e2d314a0e6d7d77761987 files/noegnud-nethack-0.8.2-gcc41.patch 595 +SHA256 fd8e7afb1f36775b0d042031c14e194b875eff01db8cfc929e63a6eccabb66e7 files/noegnud-nethack-0.8.2-gcc41.patch 595 +AUX noegnud-nethack-0.8.3-gcc41.patch 595 RMD160 ceeceb9ef8d7e386cb1e2d314a0e6d7d77761987 SHA1 924664d5aa93a7f0233022bd63fde4ac85e0952f SHA256 fd8e7afb1f36775b0d042031c14e194b875eff01db8cfc929e63a6eccabb66e7 +MD5 66aea45f1586f38fc4696cc34e8ef1d9 files/noegnud-nethack-0.8.3-gcc41.patch 595 +RMD160 ceeceb9ef8d7e386cb1e2d314a0e6d7d77761987 files/noegnud-nethack-0.8.3-gcc41.patch 595 +SHA256 fd8e7afb1f36775b0d042031c14e194b875eff01db8cfc929e63a6eccabb66e7 files/noegnud-nethack-0.8.3-gcc41.patch 595 DIST nethack-342.tgz 3475583 RMD160 ecf334ce49c950121b9df6f86bce808b66a94e97 SHA1 a630f8e1ecdc0c957dd6707acbb99dac450a57ba SHA256 81c4df0ac7d6d8c95c0874f84fde0638ff9480111dcf5ade6e4475ab7bc9e964 DIST nethack-343-src.tgz 3497458 RMD160 42f600d24715a0b7e631b357c135761410b3ca95 SHA1 c26537093c38152bc0fbcec20468d975b35f59fd SHA256 bb39c3d2a9ee2df4a0c8fdde708fbc63740853a7608d2f4c560b488124866fe4 -DIST noegnud-0.7.1-src.tar.gz 110120 RMD160 38585229cf8eecedf2bc532ad3ac20f808131422 SHA1 0fc918761d5ad70bdd4cd8249b7ec9cafd2ef92e SHA256 cdb342d40809a467e55e246d9311caefdbb96b1fe15eb5f7735a013498eb4fbb DIST noegnud-0.8.2_linux_src-minimal.tar.bz2 4801644 RMD160 527cd14212b3c8556c3e566a2ec8cde4602de2f0 SHA1 3e76405ae99bc7ed721039e78201521e28cc136a SHA256 4efa6a865226ff63e8e42b1e6a712407064ace10ac6fcae56bd0e309a6d1d903 DIST noegnud-0.8.3_linux_src-minimal.tar.bz2 4794245 RMD160 cf0234c6272b17594de24d7f2d4d1e0fa1f0624d SHA1 1214b18097a47959a73e24475e87f31d6e47f343 SHA256 226109eeafc7f54b46b8e239e90b71550b01494dc41e450ed929f26feb2a4433 -EBUILD noegnud-nethack-0.7.1.ebuild 1507 RMD160 35e66736d1a9b35586f7127e4ccd6ea2583a6434 SHA1 a9d03d77e5c5764d890316891d8323dd52223fdb SHA256 5edeeb5d95f5c033dac986310a3a739a07715a79f4e0ef56f0cc52030f51b35d -MD5 22e18492f9fe0b7799fe9356b5fb6c15 noegnud-nethack-0.7.1.ebuild 1507 -RMD160 35e66736d1a9b35586f7127e4ccd6ea2583a6434 noegnud-nethack-0.7.1.ebuild 1507 -SHA256 5edeeb5d95f5c033dac986310a3a739a07715a79f4e0ef56f0cc52030f51b35d noegnud-nethack-0.7.1.ebuild 1507 -EBUILD noegnud-nethack-0.8.2.ebuild 1962 RMD160 b5bbf29a12e4d8b522f1ec05f69741ed0cff6a5b SHA1 0d3999cbd7c5a3d848d1dabe0eeafa29aae38075 SHA256 d03f176a23f08ae442d8d3de2c498f905a9529894ce84a9faeb7e993db07debd -MD5 55bf06b303ba9a7d8e0af6c6eea684fb noegnud-nethack-0.8.2.ebuild 1962 -RMD160 b5bbf29a12e4d8b522f1ec05f69741ed0cff6a5b noegnud-nethack-0.8.2.ebuild 1962 -SHA256 d03f176a23f08ae442d8d3de2c498f905a9529894ce84a9faeb7e993db07debd noegnud-nethack-0.8.2.ebuild 1962 -EBUILD noegnud-nethack-0.8.3.ebuild 1967 RMD160 e566f18de044ed08485cd744612b68c982df20a8 SHA1 d236bab8ae2c7efee3bfdb71e727b5f53f363ea7 SHA256 3db4614bac6c79b6cc34dab53eba003615bf25345c000259a81af61642116fa0 -MD5 feb477e8d2ba5fa1adff0044415d39f7 noegnud-nethack-0.8.3.ebuild 1967 -RMD160 e566f18de044ed08485cd744612b68c982df20a8 noegnud-nethack-0.8.3.ebuild 1967 -SHA256 3db4614bac6c79b6cc34dab53eba003615bf25345c000259a81af61642116fa0 noegnud-nethack-0.8.3.ebuild 1967 -MISC ChangeLog 1106 RMD160 50b510ac52882dc08237aaf42fb48229461aabf2 SHA1 7b87fb6c046c9da86a14a20b588d3d79af236afa SHA256 2833964aa1a243ba44a7b8c25fe75240d57ae4e69bf3bc1c45d677c7f37b6193 -MD5 bc2ccc5c226fee6b4228eac6be9ca5f8 ChangeLog 1106 -RMD160 50b510ac52882dc08237aaf42fb48229461aabf2 ChangeLog 1106 -SHA256 2833964aa1a243ba44a7b8c25fe75240d57ae4e69bf3bc1c45d677c7f37b6193 ChangeLog 1106 +EBUILD noegnud-nethack-0.8.2.ebuild 2027 RMD160 be1bb4c12981e56bddd69dea2f3989c52ea50d7f SHA1 2ad47436200baf265abb45096d77f02e72b76064 SHA256 c6fe4dd63ef0c43cc1e18b1d47c122d4356e70ed483feff7ba839883ba1ddaf6 +MD5 d45cd3effd9e103055aec41947c81b12 noegnud-nethack-0.8.2.ebuild 2027 +RMD160 be1bb4c12981e56bddd69dea2f3989c52ea50d7f noegnud-nethack-0.8.2.ebuild 2027 +SHA256 c6fe4dd63ef0c43cc1e18b1d47c122d4356e70ed483feff7ba839883ba1ddaf6 noegnud-nethack-0.8.2.ebuild 2027 +EBUILD noegnud-nethack-0.8.3.ebuild 2027 RMD160 2f42854f939f8141279e43f135dfe652deac1a9a SHA1 6420f56939cd51e632d5124c49d7ea2cd2ac4558 SHA256 7e43b9f8d6edcd3ed9661fe8197cfa6f3817ee00888c6f9c03f19e6190d7abba +MD5 eee38a932754f74c639ef2c20214d63e noegnud-nethack-0.8.3.ebuild 2027 +RMD160 2f42854f939f8141279e43f135dfe652deac1a9a noegnud-nethack-0.8.3.ebuild 2027 +SHA256 7e43b9f8d6edcd3ed9661fe8197cfa6f3817ee00888c6f9c03f19e6190d7abba noegnud-nethack-0.8.3.ebuild 2027 +MISC ChangeLog 1410 RMD160 25cfa3d7625106846270a1702f289c9cb588bf27 SHA1 a235a2bbb65b9ca7cdc7878b960e7a49c078a649 SHA256 7dd54d8dd7df781cd1d15837877cc6b3fc8bd78bf5f6a3e03e8c5aa248cdd422 +MD5 68295e6605f3313641f7d868e4b02bf2 ChangeLog 1410 +RMD160 25cfa3d7625106846270a1702f289c9cb588bf27 ChangeLog 1410 +SHA256 7dd54d8dd7df781cd1d15837877cc6b3fc8bd78bf5f6a3e03e8c5aa248cdd422 ChangeLog 1410 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 da77ea73c8cbb88b5f01dd6ddbcc0688 files/digest-noegnud-nethack-0.7.1 482 -RMD160 6596d1ef48606ca590b57d3a136dacbc9033816d files/digest-noegnud-nethack-0.7.1 482 -SHA256 2b3c04eece139a972d41a7bd4af90abe3f6cb9472dd55782f189b4fb40a6561c files/digest-noegnud-nethack-0.7.1 482 MD5 2ddbf6971a9e342a712fe219cf2cf39d files/digest-noegnud-nethack-0.8.2 530 RMD160 fb94586ed15baee3e53ee65d8da5f537c597e85a files/digest-noegnud-nethack-0.8.2 530 SHA256 21eca2f8734dd02501720c3dd3764d6d9cb773708c6801046782be4cec39813a files/digest-noegnud-nethack-0.8.2 530 MD5 617e9a5f87c2c55dacb27687fa069e24 files/digest-noegnud-nethack-0.8.3 542 RMD160 fb9e80e6e019713cfc96110b147d56fe3cfceeae files/digest-noegnud-nethack-0.8.3 542 SHA256 0ebc817ecf16e2482bff138f6c8641a972f589604569a3c5d10363b1641d6b42 files/digest-noegnud-nethack-0.8.3 542 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.2 (GNU/Linux) - -iD8DBQFFy5UHkT4lNIS36YERAlnDAJ9upiUdx3xT123zonyXCr/9vt913QCdHqor -u9+HbL9MQECvpauGPW4lgmY= -=mCTY ------END PGP SIGNATURE----- diff --git a/games-roguelike/noegnud-nethack/files/digest-noegnud-nethack-0.7.1 b/games-roguelike/noegnud-nethack/files/digest-noegnud-nethack-0.7.1 deleted file mode 100644 index f22e91500495..000000000000 --- a/games-roguelike/noegnud-nethack/files/digest-noegnud-nethack-0.7.1 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 aefcbeb20210b2d64511c84bd03c3e4e nethack-341.tgz 3492419 -RMD160 d28255e76248a8658b4c08e9d55a849dd6572b17 nethack-341.tgz 3492419 -SHA256 c431c88788646751b72db75301468a4b2094ac0fddd0f9a1eec55df72013a51f nethack-341.tgz 3492419 -MD5 bc11db264ba3e42bcac3997762da7150 noegnud-0.7.1-src.tar.gz 110120 -RMD160 38585229cf8eecedf2bc532ad3ac20f808131422 noegnud-0.7.1-src.tar.gz 110120 -SHA256 cdb342d40809a467e55e246d9311caefdbb96b1fe15eb5f7735a013498eb4fbb noegnud-0.7.1-src.tar.gz 110120 diff --git a/games-roguelike/noegnud-nethack/files/noegnud-nethack-0.8.2-gcc41.patch b/games-roguelike/noegnud-nethack/files/noegnud-nethack-0.8.2-gcc41.patch new file mode 100644 index 000000000000..7742a2d3657b --- /dev/null +++ b/games-roguelike/noegnud-nethack/files/noegnud-nethack-0.8.2-gcc41.patch @@ -0,0 +1,11 @@ +--- ../noegnud/noegnud_gui.c.old 2007-01-18 11:43:45.004148588 +0100 ++++ ../noegnud/noegnud_gui.c 2007-01-18 11:43:59.563935164 +0100 +@@ -627,7 +627,7 @@ + //button=(noegnud_gui_tbutton *)noegnud_gui_create_window(parent,x,y,width,height,(sizeof(noegnud_gui_twindow)-sizeof(noegnud_gui_twidget))+datasize); + + text=noegnud_gui_create_text( +- (noegnud_gui_twidget *)button=(noegnud_gui_tbutton *)noegnud_gui_create_window( ++ /*(noegnud_gui_twidget *)*/button=(noegnud_gui_tbutton *)noegnud_gui_create_window( + parent, + x,y, + width,height, diff --git a/games-roguelike/noegnud-nethack/files/noegnud-nethack-0.8.3-gcc41.patch b/games-roguelike/noegnud-nethack/files/noegnud-nethack-0.8.3-gcc41.patch new file mode 100644 index 000000000000..7742a2d3657b --- /dev/null +++ b/games-roguelike/noegnud-nethack/files/noegnud-nethack-0.8.3-gcc41.patch @@ -0,0 +1,11 @@ +--- ../noegnud/noegnud_gui.c.old 2007-01-18 11:43:45.004148588 +0100 ++++ ../noegnud/noegnud_gui.c 2007-01-18 11:43:59.563935164 +0100 +@@ -627,7 +627,7 @@ + //button=(noegnud_gui_tbutton *)noegnud_gui_create_window(parent,x,y,width,height,(sizeof(noegnud_gui_twindow)-sizeof(noegnud_gui_twidget))+datasize); + + text=noegnud_gui_create_text( +- (noegnud_gui_twidget *)button=(noegnud_gui_tbutton *)noegnud_gui_create_window( ++ /*(noegnud_gui_twidget *)*/button=(noegnud_gui_tbutton *)noegnud_gui_create_window( + parent, + x,y, + width,height, diff --git a/games-roguelike/noegnud-nethack/noegnud-nethack-0.7.1.ebuild b/games-roguelike/noegnud-nethack/noegnud-nethack-0.7.1.ebuild deleted file mode 100644 index 428cda1cc626..000000000000 --- a/games-roguelike/noegnud-nethack/noegnud-nethack-0.7.1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-roguelike/noegnud-nethack/noegnud-nethack-0.7.1.ebuild,v 1.5 2004/06/24 23:13:41 agriffis Exp $ - -inherit games - -NH_DVER=3.4.1 -NH_VER=${NH_DVER//.} -DESCRIPTION="an alternate 2D/3D graphical user interface for NetHack" -HOMEPAGE="http://noegnud.sourceforge.net/" -SRC_URI="mirror://sourceforge/noegnud/noegnud-${PV}-src.tar.gz - mirror://sourceforge/nethack/nethack-${NH_VER}.tgz" - -LICENSE="nethack" -SLOT="0" -KEYWORDS="x86" -IUSE="" - -DEPEND="media-libs/libsdl - dev-util/yacc" -RDEPEND="media-libs/libsdl - media-libs/sdl-image - virtual/opengl - games-roguelike/noegnud-data" - -S=${WORKDIR}/noegnud-${PV}/variants - -src_unpack() { - unpack noegnud-${PV}-src.tar.gz - ln -s ${DISTDIR}/nethack-${NH_VER}.tgz noegnud-${PV}/variants/tarballs/nethack-${NH_VER}.tgz -} - -src_compile() { - make nh${NH_VER} PREFIX=${GAMES_PREFIX} || die -} - -src_install() { - make install_nh${NH_VER} PREFIX=${D}/${GAMES_PREFIX} || die - - cd ${D}/${GAMES_BINDIR} - rm noegnud-nethack-${NH_DVER} - mv noegnud-${PV}-nethack-${NH_DVER} noegnud-nethack - dosed "/^HACKDIR/s:=.*:=${GAMES_LIBDIR}/noegnud-${PV}/nethack-${NH_DVER}:" ${GAMES_BINDIR}/noegnud-nethack - - keepdir ${GAMES_LIBDIR}/noegnud-${PV}/nethack-${NH_DVER}/save - dodir ${GAMES_DATADIR}/noegnud_data - dosym ${GAMES_DATADIR}/noegnud_data ${GAMES_LIBDIR}/noegnud-${PV}/noegnud_data - - prepgamesdirs - chmod -R g+w ${D}/${GAMES_LIBDIR}/noegnud-${PV} -} diff --git a/games-roguelike/noegnud-nethack/noegnud-nethack-0.8.2.ebuild b/games-roguelike/noegnud-nethack/noegnud-nethack-0.8.2.ebuild index 669c0479d2c0..572ef46edd52 100644 --- a/games-roguelike/noegnud-nethack/noegnud-nethack-0.8.2.ebuild +++ b/games-roguelike/noegnud-nethack/noegnud-nethack-0.8.2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-roguelike/noegnud-nethack/noegnud-nethack-0.8.2.ebuild,v 1.9 2004/12/16 15:14:17 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-roguelike/noegnud-nethack/noegnud-nethack-0.8.2.ebuild,v 1.10 2007/03/14 18:19:32 mr_bones_ Exp $ -inherit games +inherit eutils games VAR_NAME=nethack VAR_SNAME=nh @@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/noegnud/noegnud-${PV}_linux_src-minimal.tar.bz2 LICENSE="nethack" SLOT="0" -KEYWORDS="x86 ppc ~amd64" +KEYWORDS="~amd64 ppc x86" IUSE="" DEPEND="media-libs/libsdl @@ -32,15 +32,17 @@ S="${WORKDIR}/noegnud-${PV}/variants" src_unpack() { unpack noegnud-${PV}_linux_src-minimal.tar.bz2 ln -s "${DISTDIR}/${VAR_TAR}" noegnud-${PV}/variants/tarballs/${VAR_TAR} + cd "${S}" + epatch "${FILESDIR}/${P}-gcc41.patch" } src_compile() { - make ${VAR_SNAME}${VAR_VER} PREFIX="${GAMES_PREFIX}" || die "make failed" + emake ${VAR_SNAME}${VAR_VER} PREFIX="${GAMES_PREFIX}" || die "emake failed" } src_install() { - make install_${VAR_SNAME}${VAR_VER} PREFIX="${D}/${GAMES_PREFIX}" \ - || die "make install failed" + emake install_${VAR_SNAME}${VAR_VER} PREFIX="${D}/${GAMES_PREFIX}" \ + || die "emake install failed" cd "${D}/${GAMES_BINDIR}" # we do this cause sometimes the installed package thinks it's a diff version :) diff --git a/games-roguelike/noegnud-nethack/noegnud-nethack-0.8.3.ebuild b/games-roguelike/noegnud-nethack/noegnud-nethack-0.8.3.ebuild index e4f5abbd92ac..017adff28f8a 100644 --- a/games-roguelike/noegnud-nethack/noegnud-nethack-0.8.3.ebuild +++ b/games-roguelike/noegnud-nethack/noegnud-nethack-0.8.3.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-roguelike/noegnud-nethack/noegnud-nethack-0.8.3.ebuild,v 1.1 2004/11/19 19:08:01 citizen428 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-roguelike/noegnud-nethack/noegnud-nethack-0.8.3.ebuild,v 1.2 2007/03/14 18:19:32 mr_bones_ Exp $ -inherit games +inherit eutils games VAR_NAME=nethack VAR_SNAME=nh @@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/noegnud/noegnud-${PV}_linux_src-minimal.tar.bz2 LICENSE="nethack" SLOT="0" -KEYWORDS="~x86 ~ppc ~amd64" +KEYWORDS="~amd64 ~ppc ~x86" IUSE="" DEPEND="media-libs/libsdl @@ -32,15 +32,17 @@ S="${WORKDIR}/noegnud-${PV}/variants" src_unpack() { unpack noegnud-${PV}_linux_src-minimal.tar.bz2 ln -s "${DISTDIR}/${VAR_TAR}" noegnud-${PV}/variants/tarballs/${VAR_TAR} + cd "${S}" + epatch "${FILESDIR}/${P}-gcc41.patch" } src_compile() { - make ${VAR_SNAME}${VAR_VER} PREFIX="${GAMES_PREFIX}" || die "make failed" + emake ${VAR_SNAME}${VAR_VER} PREFIX="${GAMES_PREFIX}" || die "emake failed" } src_install() { - make install_${VAR_SNAME}${VAR_VER} PREFIX="${D}/${GAMES_PREFIX}" \ - || die "make install failed" + emake install_${VAR_SNAME}${VAR_VER} PREFIX="${D}/${GAMES_PREFIX}" \ + || die "emake install failed" cd "${D}/${GAMES_BINDIR}" # we do this cause sometimes the installed package thinks it's a diff version :)