From: hasufell Date: Fri, 8 Mar 2013 19:03:01 +0000 (+0100) Subject: old crap, live ebuild broken X-Git-Url: http://pileus.org/git/?p=~andy%2Fsunrise;a=commitdiff_plain;h=be1aae4ad1711ae876a3dcb15497dc039528bf24 old crap, live ebuild broken --- diff --git a/games-strategy/0ad-data/0ad-data-11339_alpha9.ebuild b/games-strategy/0ad-data/0ad-data-11339_alpha9.ebuild deleted file mode 100644 index 8cabf4d7d..000000000 --- a/games-strategy/0ad-data/0ad-data-11339_alpha9.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3 - -inherit games - -MY_PV="r${PV%_*}-alpha" -MY_PN=${PN%-data} -MY_P=${MY_PN}-${MY_PV} - -DESCRIPTION="Data files for 0ad" -HOMEPAGE="http://wildfiregames.com/0ad/" -SRC_URI="mirror://sourceforge/zero-ad/${MY_P}-unix-data.tar.xz" - -LICENSE="GPL-2 CC-BY-SA-3.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -S=${WORKDIR}/${MY_P} - -src_install() { - insinto "${GAMES_DATADIR}"/${MY_PN} - doins -r binaries/data/* || die - prepgamesdirs -} diff --git a/games-strategy/0ad-data/ChangeLog b/games-strategy/0ad-data/ChangeLog deleted file mode 100644 index 1c14b3618..000000000 --- a/games-strategy/0ad-data/ChangeLog +++ /dev/null @@ -1,13 +0,0 @@ -# ChangeLog for games-strategy/0ad-data -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - - 07 Feb 2013; Ulrich Müller 0ad-data-11339_alpha9.ebuild: - Move Creative Commons licenses to shorter names. - -*0ad-data-11339_alpha9 (14 Apr 2012) - - 14 Apr 2012; hasufell - +0ad-data-11339_alpha9.ebuild, +metadata.xml: - New Ebuild for bug 278541 thanks to mgorny and binki - diff --git a/games-strategy/0ad-data/Manifest b/games-strategy/0ad-data/Manifest deleted file mode 100644 index 1531b5d63..000000000 --- a/games-strategy/0ad-data/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST 0ad-r11339-alpha-unix-data.tar.xz 294663484 SHA256 ac4cb17478eed633e1b0c975b052706797628fac399147d6301c4001100170b4 -EBUILD 0ad-data-11339_alpha9.ebuild 539 SHA256 b8440e982f3c54eee08b4db61ba5f7223a0659415611ed732a03e46acd084edd SHA512 292fa3e4194fecd5ae2638a16a9ae47b30940beaeb66a943f11ced2ed404cc9541c1e300c1b5db09ad549930632999c9b9eb5f068da17b3da40ee326d936b6c6 WHIRLPOOL 35d033285ec0e9409af2ebaf112a426b3c278cc770fec3ead30d431cfb96488889bfa10c18a61acec4a2d4607d9887f076761de0e6c548318830d85bcf118747 -MISC ChangeLog 450 SHA256 d324444d0b8dec80df16ccdccbc2cdae302e8f6b70ec41c150041fe9ab9258a6 SHA512 b195c4ac584a955ff822b505699ab014d6588e178a5ed8611a113182d2ff786bb1421c2f42665d1b8c5eebd1aa864b6de16b82b6b71399baf9ad889b12011da9 WHIRLPOOL 1f4939f21c237a38e533f9a311f205d35368ecb53b0b10b9c5e6aa2ceff9804c6104227ed3b5291e017880e54c5d8055348bdbb24c3ce35e4184ae55d99dfd39 -MISC metadata.xml 215 SHA256 592b21f1ecb71d6f5ff9509c8a334b54992e17a7845383c0e447e495c71601a3 SHA512 1694acb54a08161d4cbc15129b43ac76fcabb145aacbef46fed511454c328e07d1b8f5fd02738fbaf5b12fe4a598997a297d914c62392c61c6c0566af2f0f619 WHIRLPOOL 338e7202f112568f2a734789c796790f87b6676404ace1261ca369c3c5cb568352809563c53aa9bc264dead90b26dea8f1579a39577c174b296f8f3fd3856be1 diff --git a/games-strategy/0ad-data/metadata.xml b/games-strategy/0ad-data/metadata.xml deleted file mode 100644 index 841f145bd..000000000 --- a/games-strategy/0ad-data/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - maintainer-wanted@gentoo.org - - - diff --git a/games-strategy/0ad/0ad-11339_alpha9.ebuild b/games-strategy/0ad/0ad-11339_alpha9.ebuild deleted file mode 100644 index f20fea551..000000000 --- a/games-strategy/0ad/0ad-11339_alpha9.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3 - -WX_GTK_VER="2.8" - -inherit eutils wxwidgets games - -MY_PV="r${PV%_*}-alpha" -MY_P=${PN}-${MY_PV} - -DESCRIPTION="A free, real-time strategy game" -HOMEPAGE="http://wildfiregames.com/0ad/" -SRC_URI="mirror://sourceforge/zero-ad/${MY_P}-unix-build.tar.xz" - -LICENSE="0AD" -SLOT="0" -KEYWORDS="~amd64" -IUSE="+audio +editor fam pch test" - -RDEPEND=" - ~dev-lang/spidermonkey-1.8.5 - dev-libs/boost - dev-libs/libxml2 - media-gfx/nvidia-texture-tools - ~games-strategy/0ad-data-${PV} - media-libs/libpng:0 - media-libs/libsdl[X,opengl,video] - net-libs/enet:1.3 - net-misc/curl - sys-libs/zlib - virtual/jpeg - virtual/opengl - audio? ( media-libs/libogg - media-libs/libvorbis - media-libs/openal ) - editor? ( x11-libs/wxGTK:$WX_GTK_VER[X,opengl] ) - fam? ( virtual/fam ) - " -DEPEND="${RDEPEND} - virtual/pkgconfig - test? ( dev-lang/perl )" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - # respect flags for 3rd party fcollada - # fix test-phase - epatch "${FILESDIR}"/11339_alpha9-fcollada-makefile.patch \ - "${FILESDIR}"/11339_alpha9-test.patch -} - -src_configure() { - cd build/workspaces || die - - # custom configure script - local myconf - use fam || myconf="--without-fam" - use pch || myconf="${myconf} --without-pch" - use test || myconf="${myconf} --without-tests" - use audio || myconf="${myconf} --without-audio" - - # don't use bundled sources - ./update-workspaces.sh \ - --with-system-nvtt \ - --with-system-enet \ - --with-system-mozjs185 \ - $(use_enable editor atlas) \ - --bindir="${GAMES_BINDIR}" \ - --libdir="$(games_get_libdir)"/${PN} \ - --datadir="${GAMES_DATADIR}"/${PN} \ - ${myconf} || die -} - -src_compile() { - emake -C build/workspaces/gcc verbose=1 || die -} - -src_test() { - cd binaries/system || die - ./test || die "test phase failed" -} - -src_install() { - # bin - dogamesbin binaries/system/pyrogenesis || die - - # libs - exeinto "$(games_get_libdir)"/${PN} - doexe binaries/system/libCollada.so || die - if use editor ; then - doexe binaries/system/libAtlasUI.so || die - fi - - # other - dodoc binaries/system/readme.txt || die - doicon build/resources/${PN}.png || die - games_make_wrapper ${PN} "${GAMES_BINDIR}/pyrogenesis" - make_desktop_entry ${PN} ${PN} ${PN} - - # permissions - prepgamesdirs -} diff --git a/games-strategy/0ad/0ad-99999.ebuild b/games-strategy/0ad/0ad-99999.ebuild deleted file mode 100644 index a2a2d69f0..000000000 --- a/games-strategy/0ad/0ad-99999.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3 - -WX_GTK_VER="2.8" - -inherit eutils subversion wxwidgets games - -MY_PV="r${PV%_*}-alpha" -MY_P=${PN}-${MY_PV} - -DESCRIPTION="A free, real-time strategy game" -HOMEPAGE="http://wildfiregames.com/0ad/" -ESVN_REPO_URI="http://svn.wildfiregames.com/public/ps/trunk" - -LICENSE="0AD" -SLOT="0" -KEYWORDS="" -IUSE="+audio +editor fam +pch test" - -RDEPEND=" - ~dev-lang/spidermonkey-1.8.5 - dev-libs/boost - dev-libs/libxml2 - media-gfx/nvidia-texture-tools - !games-strategy/0ad-data - media-libs/libpng:0 - media-libs/libsdl[X,opengl,video] - net-libs/enet:1.3 - net-misc/curl - sys-libs/zlib - virtual/jpeg - virtual/opengl - audio? ( media-libs/libogg - media-libs/libvorbis - media-libs/openal ) - editor? ( x11-libs/wxGTK:$WX_GTK_VER[X,opengl] ) - fam? ( virtual/fam ) - " -DEPEND="${RDEPEND} - virtual/pkgconfig - test? ( dev-lang/perl )" - -S=${WORKDIR}/trunk - -pkg_setup() { - games_pkg_setup - - if ! use pch ; then - eerror "pch useflag is potentially broken" - eerror "see http://trac.wildfiregames.com/ticket/1313" - fi -} - -src_unpack() { - subversion_src_unpack -} - -src_configure() { - cd build/workspaces || die - - # custom configure script - local myconf - use fam || myconf="--without-fam" - use pch || myconf="${myconf} --without-pch" - use test || myconf="${myconf} --without-tests" - use audio || myconf="${myconf} --without-audio" - - # don't use bundled sources - ./update-workspaces.sh \ - --with-system-nvtt \ - --with-system-enet \ - --with-system-mozjs185 \ - $(use_enable editor atlas) \ - --bindir="${GAMES_BINDIR}" \ - --libdir="$(games_get_libdir)"/${PN} \ - --datadir="${GAMES_DATADIR}"/${PN} \ - ${myconf} || die -} - -src_compile() { - emake -C build/workspaces/gcc verbose=1 || die -} - -src_test() { - cd binaries/system || die - ./test || die "test phase failed" -} - -src_install() { - # data - insinto "${GAMES_DATADIR}"/${PN} - doins -r binaries/data/* || die - - # bin - dogamesbin binaries/system/pyrogenesis || die - - # libs - exeinto "$(games_get_libdir)"/${PN} - doexe binaries/system/libCollada.so || die - if use editor ; then - doexe binaries/system/libAtlasUI.so || die - fi - - # other - dodoc binaries/system/readme.txt || die - doicon build/resources/${PN}.png || die - games_make_wrapper ${PN} "${GAMES_BINDIR}/pyrogenesis" - make_desktop_entry ${PN} ${PN} ${PN} - - # permissions - prepgamesdirs -} diff --git a/games-strategy/0ad/ChangeLog b/games-strategy/0ad/ChangeLog deleted file mode 100644 index 200ac9dc3..000000000 --- a/games-strategy/0ad/ChangeLog +++ /dev/null @@ -1,33 +0,0 @@ -# ChangeLog for games-strategy/0ad -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - - 15 Jan 2013; Davide Gerhard (ra1nb0w) - 0ad-11339_alpha9.ebuild, 0ad-99999.ebuild: - Changed the license to 0AD - - 05 May 2012; Mike Gilbert 0ad-11339_alpha9.ebuild, - 0ad-99999.ebuild: - Change dev-util/nvidia-texture-tools to media-gfx/nvidia-texture-tools to - match gentoo-x86 naming. - - 05 May 2012; Mike Gilbert 0ad-11339_alpha9.ebuild, - 0ad-99999.ebuild: - Use pkgconfig virtual. - - 24 Apr 2012; hasufell - +files/11339_alpha9-test.patch, 0ad-11339_alpha9.ebuild: - fix for test-phase when fam is disabled - - 24 Apr 2012; hasufell 0ad-11339_alpha9.ebuild, - 0ad-99999.ebuild: - fix test phase (was referring to non-existent useflag) - -*0ad-99999 (14 Apr 2012) -*0ad-11339_alpha9 (14 Apr 2012) - - 14 Apr 2012; hasufell - +files/11339_alpha9-fcollada-makefile.patch, +0ad-11339_alpha9.ebuild, - +0ad-99999.ebuild, +metadata.xml: - New Ebuild for bug 278541 thanks to mgorny and binki - diff --git a/games-strategy/0ad/Manifest b/games-strategy/0ad/Manifest deleted file mode 100644 index a64199d1f..000000000 --- a/games-strategy/0ad/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -AUX 11339_alpha9-fcollada-makefile.patch 1069 SHA256 11ed3a1d83c2784d590ec047750cd1cc56932ad2e10203f70f72d19fe879464f SHA512 75cfc775be4f6002c8810e49c5097ef92c87954a8ecc16f0f1fab7e4b0e37756f8f50c4d4bac77450acdddf805c2e4d8cb486e5fde53168203f36e831ff588cc WHIRLPOOL 13a116074701999cac6c1158a636643a6d9d394f0b49c131a41adf69194595aeb9ff0a3358287e742a279c6de454caf69d21f8deff78cf0a41da0b413c57aeb3 -AUX 11339_alpha9-test.patch 970 SHA256 5439c079d32225c2f29ec73b920cb8294a9beffdf6edea41bc01a8a02c453f0b SHA512 025f3d2a726acec4a9332b4a358d0a5166a28b7e862e808b68af449587caff948e95ea8cbf2cfa606de73f38dd5756a9cbf0635dcb4619dd232f27247c0c0707 WHIRLPOOL 9e8d1c9b5babf1344d5ca2604a23946dfa0ccf59dc45e940f00befddbb0b4a749c17f2345bb1ca97dcca012d40f643d42ae0d7c6c28494f256a3b3370c1e7598 -DIST 0ad-r11339-alpha-unix-build.tar.xz 8593664 SHA256 1e69bc02c1af1bfbe30244467761d13e1aaff164fe583d962cc8e13faf4a56cb -EBUILD 0ad-11339_alpha9.ebuild 2293 SHA256 436865b0ba7e1ae79bc86969e966b53d39e902a3baf6608dfc58a85a757ef5ca SHA512 dcf5361ea138c4a3bf14fad17fbadd23111fb9c755c1035bd91718b905703156bfd154d7e981244d29533bc026e9f3877731d1a7d5104f689b91c4c9bf89dc66 WHIRLPOOL e7f62761e6f026091b935843145b58997423a7fa303078235f599f3938975180ecdef15ad714da4e7cde4a74a722b340040675315d2bf8dc1baa138c3c371551 -EBUILD 0ad-99999.ebuild 2388 SHA256 d7ece15751e3a7c5768f22a4b2645fc4c39b553bec22ef91148d11ecf40bf2af SHA512 fc1324045923385ec295383d41361b100c454c6558d41bc06ef8318defd7909b7c35b93d4088683a5facc89715f4d535d8503f972a027a387426dce30af6f1e8 WHIRLPOOL 76c12fb58ee5b45fc32c91ecfc529bc27c18437348ddefd7607e3855753e0ee65ae8eb34b51ca1c589f3eb55c8ee9329617c657e0813e15c55d9acff1f32cca8 -MISC ChangeLog 1162 SHA256 08a78cb797f8e33892186a4a83a118f142007542e62d6b3dc1cfc8fa4092d0e9 SHA512 aa932c80dff69ffb5c36012e850d6143c372fb7d53d37bae025c6ea85a742ffd431d26dc7c9a66d3defbab5745df3fa8d786eb0a8de5403d5442656e478d8e93 WHIRLPOOL fe1dd70bb529ae993ae95c4743572c75468cbfd2d0ebe3edbd06087a082cde3c4b2f7881f9b8dfd78581cb30d7589d8572b0f89b2ce5aa1d54a50715f8e67ce5 -MISC metadata.xml 340 SHA256 79e3cad447e25c2749b646cf284cda9c44abb3865a89998a08f7e3df1561b73e SHA512 5df8b482b082357b78decac6e523d42b67627220d363119d8a80bd4e957c288f35ef33388b8fcbf1a15f18a290429caf4ca2188594430259530953dcae357a02 WHIRLPOOL 6f1a6e466e69d42097fb66233c4878102903774c512f2087f5c493d10857dd10ac93932d3722023f257eed8cae10066613465654b0b49ede49bbb0c2ebe7bc37 diff --git a/games-strategy/0ad/files/11339_alpha9-fcollada-makefile.patch b/games-strategy/0ad/files/11339_alpha9-fcollada-makefile.patch deleted file mode 100644 index e397e8692..000000000 --- a/games-strategy/0ad/files/11339_alpha9-fcollada-makefile.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: hasufell -Date: Wed Apr 11 14:45:32 UTC 2012 - -FCollada Makefile does not respect CXX and flags - ---- libraries/fcollada/src/Makefile -+++ libraries/fcollada/src/Makefile -@@ -7,14 +7,14 @@ - PIC_FLAGS ?= -fpic - endif - --CXX := g++ --CXXFLAGS := -fvisibility=hidden -W -Wall -Wno-unused-parameter -Wno-unused-function $(OS_DEFINE) $(PIC_FLAGS) $(CPPFLAGS) -+CXX ?= g++ -+CXXFLAGS += -fvisibility=hidden -W -Wall -Wno-unused-parameter -Wno-unused-function $(OS_DEFINE) $(PIC_FLAGS) $(CPPFLAGS) - CXXFLAGS_DEBUG := -O0 -g -D_DEBUG -DRETAIL - CXXFLAGS_RELEASE := -O1 -DNDEBUG -DRETAIL - # (-O2 with gcc 4.3 causes linker errors when using this library, for unknown reasons, so stick with -O1) - CXXFLAGS_TEST := -O0 -g -D_DEBUG --LIBS := `pkg-config libxml-2.0 --libs` --INCLUDES := -IFCollada `pkg-config libxml-2.0 --cflags` -+LIBS += `pkg-config libxml-2.0 --libs` -+INCLUDES += -IFCollada `pkg-config libxml-2.0 --cflags` - INCLUDES_TEST := -IFCollada/FColladaTest $(INCLUDES) - - # FCollada is not aliasing-safe, so disallow dangerous optimisations diff --git a/games-strategy/0ad/files/11339_alpha9-test.patch b/games-strategy/0ad/files/11339_alpha9-test.patch deleted file mode 100644 index 82f737aa5..000000000 --- a/games-strategy/0ad/files/11339_alpha9-test.patch +++ /dev/null @@ -1,46 +0,0 @@ -upstream patch: http://trac.wildfiregames.com/changeset/11661 - -Build test executable with same linker settings as game executable, -to fix --without-fam - ---- build/premake/premake4.lua -+++ build/premake/premake4.lua -@@ -1167,13 +1167,20 @@ - - project_add_manifest() - -- elseif os.is("linux") or os.is ("bsd") then -- -- links { -- "fam", -- -- Utilities -- "rt", -- } -+ elseif os.is("linux") or os.is("bsd") then -+ -+ if not _OPTIONS["without-fam"] then -+ links { "fam" } -+ end -+ -+ if not _OPTIONS["android"] then -+ links { "rt" } -+ end -+ -+ if _OPTIONS["android"] then -+ -- NDK's STANDALONE-TOOLCHAIN.html says this is required -+ linkoptions { "-Wl,--fix-cortex-a8" } -+ end - - if os.is("linux") then - links { -@@ -1189,7 +1196,9 @@ - - -- Threading support - buildoptions { "-pthread" } -- linkoptions { "-pthread" } -+ if not _OPTIONS["android"] then -+ linkoptions { "-pthread" } -+ end - - -- For debug_resolve_symbol - configuration "Debug" diff --git a/games-strategy/0ad/metadata.xml b/games-strategy/0ad/metadata.xml deleted file mode 100644 index b699881d7..000000000 --- a/games-strategy/0ad/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - maintainer-wanted@gentoo.org - - - Audio support - Include Atlas scenario editor projects - - -