fix deps (bug #149100) with patch from James Rowe

(Portage version: 2.1.2_pre1-r2)
 (Unsigned Manifest commit)

3 files changed, 14 insertions, 119 deletions

diff --git a/games-arcade/koules/Manifest b/games-arcade/koules/Manifest
index 59d31e704acb..202ffab30981 100644
--- a/games-arcade/koules/Manifest
+++ b/games-arcade/koules/Manifest
@@ -1,12 +1,17 @@
-MD5 2b125e09b05e7b63b471b3a737402234 ChangeLog 1404
-RMD160 c4cc526e1bb8cee0172aa10b65e650c505e8b584 ChangeLog 1404
-SHA256 10a6cbd6833f94ba18b4101d1da11710d41737ec4e7d01755744187f6b4f8cd9 ChangeLog 1404
-MD5 c489ac998a0db9dabf547376a262719a files/digest-koules-1.4-r1 133
-RMD160 43d42123fbc9f1cdfbaf6717cc784e67d4042d29 files/digest-koules-1.4-r1 133
-SHA256 26f962ef12118e88dded20f7bed68b09a841acb9688729cfa1f3f5a28214607f files/digest-koules-1.4-r1 133
-MD5 12cfe680ad04c278b4718d9de99befb5 koules-1.4-r1.ebuild 2759
-RMD160 f6d2c7c100b29c304853b584aca59744f9b6c3bb koules-1.4-r1.ebuild 2759
-SHA256 23afac72f8773c892808ee58953ddfc396e954780b2f1f85e3a7310a2aa8d524 koules-1.4-r1.ebuild 2759
+DIST koules-1.4-gcc3.patch.bz2 5635 RMD160 cf2751890aff57cc87fa241137e832a0d158ab6d SHA1 338e3da351e593fd015b72a777b6d60215b42fe9 SHA256 adf7b6b6353b024088a90b5b80b00a10813a624d2d1a4f63ecebad613ca591d4
+DIST koules1.4-src.tar.gz 315386 RMD160 d43eb5cf68abad12d4d8a16789cda43f307b2fe7 SHA1 bfd6ece4452b067b0b0f9a9a7085cf43b88f0ef9 SHA256 c36f93feafeebd59983bf44100240e67a84a8bacabd7ee528c93046defe4a21b
+EBUILD koules-1.4-r2.ebuild 2743 RMD160 1d669c3927ab6970e2268f98d4601a4be255dcc6 SHA1 aff5b5336cf50102ec1c7039b69765b25db076e2 SHA256 4f62dbc94bf695e5f3e3da5e03ebb9e44a7f2be1170758ab77e590148a0be6d8
+MD5 282de13adbe733175e87672a08da5dbe koules-1.4-r2.ebuild 2743
+RMD160 1d669c3927ab6970e2268f98d4601a4be255dcc6 koules-1.4-r2.ebuild 2743
+SHA256 4f62dbc94bf695e5f3e3da5e03ebb9e44a7f2be1170758ab77e590148a0be6d8 koules-1.4-r2.ebuild 2743
+MISC ChangeLog 1591 RMD160 5ba6a0e782dfcc21e0274ce2bd769070463821df SHA1 406b3ca95d64ae87412eef6b1886c916a9e2f91f SHA256 93770126efe15daf04d32721c9924f18be93d0a3463d1ceda89fae1b1ad1f173
+MD5 1bd9e3222c14186d7a3f15d9fd0f8219 ChangeLog 1591
+RMD160 5ba6a0e782dfcc21e0274ce2bd769070463821df ChangeLog 1591
+SHA256 93770126efe15daf04d32721c9924f18be93d0a3463d1ceda89fae1b1ad1f173 ChangeLog 1591
+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 76cb573d91db9b901900638034c10da6 files/digest-koules-1.4-r2 491
+RMD160 8e203c508a6f5b9d70a58da6e772319176281e57 files/digest-koules-1.4-r2 491
+SHA256 d9a84234ce13f1506955870cfaf62b04fb6dc065cca573b0f95a472ed0587d3b files/digest-koules-1.4-r2 491
diff --git a/games-arcade/koules/files/digest-koules-1.4-r1 b/games-arcade/koules/files/digest-koules-1.4-r1
deleted file mode 100644
index e29bd123155f..000000000000
--- a/games-arcade/koules/files/digest-koules-1.4-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 b16677698a084e11e78324098b7a9e57 koules-1.4-gcc3.patch.bz2 5635
-MD5 0a5ac9e57c8b72e9fc200bc98273235c koules1.4-src.tar.gz 315386
diff --git a/games-arcade/koules/koules-1.4-r1.ebuild b/games-arcade/koules/koules-1.4-r1.ebuild
deleted file mode 100644
index f37337819496..000000000000
--- a/games-arcade/koules/koules-1.4-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/koules/koules-1.4-r1.ebuild,v 1.15 2006/02/11 19:43:04 wolf31o2 Exp $
-
-inherit eutils games
-
-DESCRIPTION="fast action arcade-style game w/sound and network support"
-HOMEPAGE="http://www.ucw.cz/~hubicka/koules/English/"
-SRC_URI="http://www.ucw.cz/~hubicka/koules/packages/koules${PV}-src.tar.gz
-	mirror://gentoo/${P}-gcc3.patch.bz2
-	http://dev.gentoo.org/~wolf31o2/sources/dump/${P}-gcc3.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE="svga joystick tcltk"
-
-RDEPEND="|| (
-	svga? ( media-libs/svgalib )
-	(
-		x11-libs/libX11
-		x11-libs/libXext )
-	virtual/x11 )
-	|| (
-		tcltk? ( dev-lang/tk dev-lang/tcl )
-		dev-util/dialog )"
-
-DEPEND="${RDEPEND}
-	!svga? (
-		|| (
-			(
-				x11-proto/xextproto
-				x11-proto/xproto
-				x11-misc/gccmakedep
-				x11-misc/imake )
-			virtual/x11 )
-		app-text/rman )"
-
-S=${WORKDIR}/${PN}${PV}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${WORKDIR}"/${P}-gcc3.patch
-	sed -i \
-		-e "/^KOULESDIR/s:=.*:=${GAMES_BINDIR}:" \
-		-e "/^SOUNDDIR/s:=.*:=${GAMES_DATADIR}/${PN}:" Iconfig \
-			|| die "sed Iconfig failed"
-	sed -i \
-		-e 's:-c -o $*.o:-c:' \
-		-e 's:-S -o $*.s:-S:' \
-		-e 's:$(ARCH)::' \
-		-e "s:-fomit-frame-pointer -O3 -ffast-math:${CFLAGS}:" \
-		Makefile.svgalib || die "sed Makefile.svgalib failed"
-	use joystick && echo '#define JOYSTICK' >> Iconfig
-	sed -i \
-		-e "s:/usr/local/bin:${GAMES_BINDIR}:" koules \
-			|| die "sed koules failed"
-	if use tcltk ; then
-		sed -i \
-			-e "s:/usr/bin/X11:${GAMES_BINDIR}:" \
-			-e "s:/usr/local/bin:${GAMES_BINDIR}:" \
-			-e "s:/usr/local/lib/koules:${GAMES_DATADIR}/${PN}:" koules.tcl \
-				|| die "sed koules.tcl failed"
-	else
-		sed -i \
-			-e 's:exec.*tcl:exec xkoules "$@":' koules \
-				|| die "sed koules failed"
-	fi
-	ln -s xkoules.6 xkoules.man
-	ln -s xkoules.6 xkoules._man
-}
-
-src_compile() {
-	mkdir bins
-	if ! use svga ; then
-		xmkmf -a
-		sed -i \
-			-e '/SYSDEFS =/d' \
-			-e "/^ *CFLAGS =/s:$: ${CFLAGS}:" Makefile \
-				|| die "sed Makefile failed"
-		emake -j1 || die "emake X failed"
-		mv xkoules bins/
-	fi
-	if use svga ; then
-		make clean
-		ln -s ../init.o svgalib/
-		emake -j1 -f Makefile.svgalib || die "emake svga failed"
-		mv koules.svga bins/
-	fi
-}
-
-src_install() {
-	dogamesbin koules bins/* || die "dogamesbin failed"
-	exeinto "${GAMES_DATADIR}/${PN}"
-	doexe koules.sndsrv.linux || die "doexe failed"
-	if use tcltk ; then
-		dogamesbin koules.tcl || die "dogamebin failed (tcl)"
-	fi
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins sounds/* || die "doins failed (sounds)"
-
-	doman xkoules.6
-	use svga && doman koules.svga.6
-	dodoc README ChangeLog BUGS ANNOUNCE TODO Koules.FAQ
-
-	prepgamesdirs
-}