[games-fps/assaultcube] Bump, see #162945

3 files changed, 27 insertions, 23 deletions

diff --git a/games-fps/assaultcube/ChangeLog b/games-fps/assaultcube/ChangeLog
index 853834e11..b1f198b88 100644
--- a/games-fps/assaultcube/ChangeLog
+++ b/games-fps/assaultcube/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for games-fps/assaultcube
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*assaultcube-1.1.0.4 (18 Mar 2013)
+
+  18 Mar 2013; Patrick Lauer <patrick@gentoo.org> -assaultcube-1.0.4.ebuild,
+  +assaultcube-1.1.0.4.ebuild:
+  [games-fps/assaultcube] Bump, see #162945
+
   01 Jul 2010; Michał Górny (sedzimir) <mgorny.3ehbo@mailnull.com>
   assaultcube-1.0.4.ebuild:
   Adjust 'find' calls to be POSIX-compliant.
diff --git a/games-fps/assaultcube/Manifest b/games-fps/assaultcube/Manifest
index 63fb0f2df..42dc3cafe 100644
--- a/games-fps/assaultcube/Manifest
+++ b/games-fps/assaultcube/Manifest
@@ -1,5 +1,5 @@
-DIST AssaultCube_v1.0.2.tar.bz2 42673504 RMD160 d95f2d8b569aeb7e7dd9f7d654b51bae26635c54 SHA1 7b0ad8c1c3960eed59a14b22aa25d40afe080275 SHA256 d4de1b1154c8aceccc0e961b751d01fd506f359472a648b88c639f99eb18c795
-DIST AssaultCube_v1.0.4-Update.tar.bz2 3339841 RMD160 79f42b89953850e1ca58ee251593b353ef0359d7 SHA1 3e667802282955958031ca89e0c46ddb8b9c7920 SHA256 fa72e537ac29b6ba91438585b765185a6898e522c04d4c08f74910040648606c
-EBUILD assaultcube-1.0.4.ebuild 2359 RMD160 1232b3b84dc11828de6715a721804fae143ed751 SHA1 c936600aa96b3c39eb68051cf2147998b163963c SHA256 143b36c9f306329c8c2a63ff53034cb5f0427047e5124c3a0407ce924b7dd290
-MISC ChangeLog 863 RMD160 8ee2f804944bbd5e6cf5b958f6f7eac0cd0d6f2d SHA1 014f1c4845308e65694cffb1a95780c2ed222fc3 SHA256 2e0e255d6f28d70d1427f37558416749a5e1133a4133a47a745f3d0bbf478246
-MISC metadata.xml 208 RMD160 c18611400760e42bdd001905be0a63c2e963bcea SHA1 595816105cac477cb85792a182e15888029118a1 SHA256 c4841c87f0c2b9b5e679a27dc72180be8d508fb3f5df0fbab2ec2c805c0a6d82
+DIST AssaultCube_v1.1.0.4.tar.bz2 47051151 SHA256 fea2056aa7262617b96b06ea0b85422bcec54d88cd88689c2c73ade3bd0ba029 SHA512 5cfe967a1df27b7c294ae1460c9aa7ba26b83430b0ddaa448b3efc5f8244e9a2ce43ba7fcf678d0e9f1c1810c45de7c521186cf19a5ea0028d754836fdc5858d WHIRLPOOL 990a7c0797d2dfbbc3ba3f8da5a66fd0e9450ef4b643b7989c2956170cb79ad4ae7bed93286ebefac9d37e9c286e92edf24a8f3a4a0e7f30050a2a05bd1ff6e6
+DIST AssaultCube_v1.1.0.4_source.tar.bz2 2560572 SHA256 045925610c54b2764a79286aeb1942df2cc5ce52b710c26b447eea69fa6b1129 SHA512 0248fe9e504863725fa627de823422fa47fdb263fffdbb6cad8eb23096390ffdec2a219fcf1e3c4e41fb944970a4f292fa4f5dd9a4a485f022d9dc49ee2743bf WHIRLPOOL 89ec7660a7883abd16178497c609b980e9a08cf3be6ba5e80c64aea2b23a8b602b1ee3a1670c8f5bcf96d18befec319ce7e1346b13f347585b74c7677ef2d024
+EBUILD assaultcube-1.1.0.4.ebuild 2398 SHA256 3160b8dd14809b0495ef8c3499f48c26bcea30281a37e439396a981ed1869075 SHA512 9bc927cd6ecad7ef058146d3ea3fbaa84865e39d7e45e5b3298e5be528cb98e8a5f7824f8defea990f83f38ba55448fb735ef1386ed8dca5ed1fe24126bea059 WHIRLPOOL 836003590d7d8f18a613e665665ac74e21594c4d8f7c3e129dbc1c758889b8e119e588e945daa83e874eecffc0c7b331669f142aec62a6777d1f28cc16940dff
+MISC ChangeLog 1052 SHA256 c35742ff6688f768238ec726b262029cefe8c8a8053d2ea4f52fb2aa1f7a323f SHA512 7f912e0abfdd97e095eb773c067e8f8e6b5847f4a48c82d436f7bcc726dcb86f468a212230f37582e12ab83d19c2491bf5a489b1681b4582431fdf352b95dca3 WHIRLPOOL 69a7b088bb7e002a58a19bc401ac331e1a15bb7cd94358c69cdd44bbde123148535214ea0245cb488d69626ed9993d169648346acc64879aefe5c90d6eefe99b
+MISC metadata.xml 208 SHA256 c4841c87f0c2b9b5e679a27dc72180be8d508fb3f5df0fbab2ec2c805c0a6d82 SHA512 21d90d4547c76c80e50e134359dfbec42b158bbc16e4741738bdde5f67b7926d158dae1905948a477405b74e754ce4ed63cad910f220a709db8dfccf160e5288 WHIRLPOOL 33ec53f42c7a8c4c419989bd94e083c417574463e19c9c1322e6b96d0f5a6a52e3dd69fbedf2d11a7a77d24a93b81f3a604b6b33cac62548389537bf3e42df0e
diff --git a/games-fps/assaultcube/assaultcube-1.0.4.ebuild b/games-fps/assaultcube/assaultcube-1.1.0.4.ebuild
index 5c03878e7..7642499e9 100644
--- a/games-fps/assaultcube/assaultcube-1.0.4.ebuild
+++ b/games-fps/assaultcube/assaultcube-1.1.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -9,9 +9,9 @@ inherit eutils games multilib toolchain-funcs
 DESCRIPTION="Fast and fun first-person-shooter based on the Cube fps"
 HOMEPAGE="http://assault.cubers.net"
 MY_PN="AssaultCube"
-MY_PV_BASE=1.0.2
-SRC_URI="mirror://sourceforge/actiongame/${MY_PN}_v${MY_PV_BASE}.tar.bz2
-	mirror://sourceforge/actiongame/${MY_PN}_v${PV}-Update.tar.bz2"
+
+SRC_URI="mirror://sourceforge/actiongame/${MY_PN}%20Version%20${PV}/${MY_PN}_v${PV}.tar.bz2
+	mirror://sourceforge/actiongame/${MY_PN}%20Version%20${PV}/${MY_PN}_v${PV}_source.tar.bz2"
 
 LICENSE="ZLIB"
 SLOT="0"
@@ -27,10 +27,9 @@ RDEPEND="opengl? (
 		virtual/opengl
 		x11-libs/libX11 )"
 DEPEND="${RDEPEND}
-	media-libs/netpbm
 	>=net-libs/enet-1.2.1"
 
-S=${WORKDIR}/${MY_PN}_v${MY_PV_BASE}
+S=${WORKDIR}/${PV}
 
 pkg_setup() {
 	if ! use dedicated && ! use opengl ; then
@@ -39,17 +38,12 @@ pkg_setup() {
 	fi
 }
 
-src_unpack() {
-	unpack ${MY_PN}_v${MY_PV_BASE}.tar.bz2
-	cd "${S}" || die
-	unpack ${MY_PN}_v${PV}-Update.tar.bz2
-}
-
 src_prepare() {
-	rm -r bin_unix/* source/include || die
+	rm -r bin_unix/* || die
 	find packages -name readme.txt -exec rm -f {} + || die
-	winicontoppm icon.ico | ppmtoxpm > ${PN}.xpm || die
-
+	#winicontoppm fails with compressed icons
+	#winicontoppm source/vcpp/buildEnv/icon.ico | ppmtoxpm > ${PN}.xpm || die
+	mv source/vcpp/buildEnv/icon.ico ${PN}.ico || die
 	sed -i -e "/^CUBE_DIR=/d ; 2iCUBE_DIR=$(games_get_libdir)/${PN}" ${PN}.sh server.sh || die
 	sed -i -e "s:bin_unix/\${SYSTEM_NAME}\${MACHINE_NAME}:ac_:" ${PN}.sh server.sh || die
 	sed -i -e "s:cd \${CUBE_DIR}:cd ${GAMES_DATADIR}/${PN}:" ${PN}.sh server.sh || die
@@ -68,7 +62,9 @@ src_compile() {
 
 src_install() {
 	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r bot config packages || die
+
+	#doins -r bot config packages || die
+	doins -r config packages || die
 
 	exeinto "$(games_get_libdir)/${PN}"
 	if use opengl ; then
@@ -82,7 +78,8 @@ src_install() {
 		make_desktop_entry ${PN}-server "${MY_PN} Server" ${PN}
 	fi
 	insinto /usr/share/pixmaps
-	doins ${PN}.xpm || die
+#	doins ${PN}.xpm || die
+	doins ${PN}.ico || die
 
 	if use doc ; then
 		rm -r docs/autogen || die
@@ -91,3 +88,4 @@ src_install() {
 
 	prepgamesdirs
 }
+