Remove sdl USE flag, bug #206404

Package-Manager: portage-2.1.4

3 files changed, 41 insertions, 31 deletions

diff --git a/games-puzzle/xwelltris/ChangeLog b/games-puzzle/xwelltris/ChangeLog
index e52373c25088..8e0d505d91bf 100644
--- a/games-puzzle/xwelltris/ChangeLog
+++ b/games-puzzle/xwelltris/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-puzzle/xwelltris
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xwelltris/ChangeLog,v 1.11 2007/02/22 01:18:42 peper Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xwelltris/ChangeLog,v 1.12 2008/01/19 04:51:43 nyhm Exp $
+
+  19 Jan 2008; Tristan Heaven <nyhm@gentoo.org> xwelltris-1.0.1.ebuild:
+  Remove sdl USE flag, bug #206404
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/games-puzzle/xwelltris/Manifest b/games-puzzle/xwelltris/Manifest
index b532037e0b85..932d771f3bf4 100644
--- a/games-puzzle/xwelltris/Manifest
+++ b/games-puzzle/xwelltris/Manifest
@@ -1,12 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST xwelltris-1.0.1.src.tar.gz 422822 RMD160 32c11ba23e90baf1004d44c297d0d84f805a731e SHA1 a4c63817966812eadaa0e4147f63889864d8b72a SHA256 c7b6321a9a6e735d4e57ec350adc7a6eabf76b8e9fb9d4cf9d91243da2adb38b
-EBUILD xwelltris-1.0.1.ebuild 1324 RMD160 410faaaacfa1f09ecb9f7aef0e5787962eb5f392 SHA1 843bfcb01e3333b4945175a4f310809a9240bddd SHA256 c642999df9305990dfff2b5a84a7636131b3352c62693717429bbef72be5da42
-MD5 9c31e97f8c005ae556fb31c007d77d8c xwelltris-1.0.1.ebuild 1324
-RMD160 410faaaacfa1f09ecb9f7aef0e5787962eb5f392 xwelltris-1.0.1.ebuild 1324
-SHA256 c642999df9305990dfff2b5a84a7636131b3352c62693717429bbef72be5da42 xwelltris-1.0.1.ebuild 1324
-MISC ChangeLog 1348 RMD160 57f43f31bb53d94cabee6788de6e50fa2c786199 SHA1 f45cfdaaa7bd1216d9a584785cd69dfc354f4580 SHA256 2a4f8021cd196d811cb60b0e9ed9fefa1199c00a57e8e4a16c59cd5f8f53a3b2
-MD5 8dcab6d840a920b4b4f2ed9da3f10289 ChangeLog 1348
-RMD160 57f43f31bb53d94cabee6788de6e50fa2c786199 ChangeLog 1348
-SHA256 2a4f8021cd196d811cb60b0e9ed9fefa1199c00a57e8e4a16c59cd5f8f53a3b2 ChangeLog 1348
+EBUILD xwelltris-1.0.1.ebuild 1187 RMD160 26c47432831bf0cf451d4d21eedde69dc47bf5c9 SHA1 a5056b35c559e4d8fb182c4f3b0b1f24eadce31b SHA256 b7241ffb28f24fc9849f264f6bf3571a9f630870015dc88b32239f6ef9f1b887
+MD5 4639cca8cd027020bd07b227a66ccc0a xwelltris-1.0.1.ebuild 1187
+RMD160 26c47432831bf0cf451d4d21eedde69dc47bf5c9 xwelltris-1.0.1.ebuild 1187
+SHA256 b7241ffb28f24fc9849f264f6bf3571a9f630870015dc88b32239f6ef9f1b887 xwelltris-1.0.1.ebuild 1187
+MISC ChangeLog 1455 RMD160 047fe51767269b0c01a326a35fd2f1275b393962 SHA1 c5c9d8177537b497d8ccb89cc85a17eff1c14929 SHA256 1c6cae614e19359e6cb345d94269d8d45bb90775e46138448fc8d211f7bd357d
+MD5 8ababdac372fe726715aa128ea07086a ChangeLog 1455
+RMD160 047fe51767269b0c01a326a35fd2f1275b393962 ChangeLog 1455
+SHA256 1c6cae614e19359e6cb345d94269d8d45bb90775e46138448fc8d211f7bd357d ChangeLog 1455
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -14,3 +17,10 @@ SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata
 MD5 17a43c023d197f7bf470286f7ed9a00c files/digest-xwelltris-1.0.1 259
 RMD160 9f594a9b1637a50abde330c9322e8089a7c3f53e files/digest-xwelltris-1.0.1 259
 SHA256 452afda94db5d7f37947f0ee78533c5c64ca2643ccbcf1c48534efe18e99fe2f files/digest-xwelltris-1.0.1 259
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHkYHkdz7hIScOURERArWlAJ9Fwo20QA0nfsUmHsj4hjkz2sQZGwCg3wiM
+QBS7mxgil+0VVaYX8J3/b9Y=
+=VPB7
+-----END PGP SIGNATURE-----
diff --git a/games-puzzle/xwelltris/xwelltris-1.0.1.ebuild b/games-puzzle/xwelltris/xwelltris-1.0.1.ebuild
index e78f83ff4947..a44f6df95659 100644
--- a/games-puzzle/xwelltris/xwelltris-1.0.1.ebuild
+++ b/games-puzzle/xwelltris/xwelltris-1.0.1.ebuild
@@ -1,50 +1,47 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xwelltris/xwelltris-1.0.1.ebuild,v 1.13 2006/12/06 17:23:52 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xwelltris/xwelltris-1.0.1.ebuild,v 1.14 2008/01/19 04:51:43 nyhm Exp $
 
 inherit games
 
-DESCRIPTION="tetris like popular game"
+DESCRIPTION="2.5D tetris like game"
 HOMEPAGE="http://xnc.dubna.su/xwelltris/"
 SRC_URI="http://xnc.dubna.su/xwelltris/src/${P}.src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE="sdl"
+IUSE=""
 
-RDEPEND="x11-misc/xbitmaps
-	x11-libs/libX11
-	x11-libs/libXt
-	x11-libs/libXmu
-	x11-libs/libXaw
-	sdl? ( media-libs/libsdl media-libs/sdl-image )"
-DEPEND="${RDEPEND}
-	x11-proto/xproto"
+DEPEND="media-libs/libsdl
+	media-libs/sdl-image"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	sed -i '/INSTALL_PROGRAM/s/-s //' src/Make.common.in || die "sed failed"
+	sed -i \
+		-e '/INSTALL_PROGRAM/s/-s //' \
+		src/Make.common.in \
+		|| die "sed Make.common.in failed"
+	sed -i \
+		-e "/GLOBAL_SEARCH/s:\".*\":\"${GAMES_DATADIR}/${PN}\":" \
+		src/include/globals.h.in \
+		|| die "sed globals.h.in failed"
 }
 
 src_compile() {
 	# configure/build process is pretty messed up
-	egamesconf $(use_with sdl) || die "egamesconf failed"
-	sed -i \
-		-e "/GLOBAL_SEARCH/s:\".*\":\"${GAMES_DATADIR}/${PN}\":" \
-			src/include/globals.h \
-			|| die "sed src/include/globals.h failed"
-	emake || die "emake failed"
+	egamesconf --with-sdl || die
+	emake -C src || die "emake failed"
 }
 
 src_install() {
 	dodir "${GAMES_BINDIR}" "${GAMES_DATADIR}/${PN}" /usr/share/man
-	make install \
+	emake install \
 		INSTDIR="${D}/${GAMES_BINDIR}" \
 		INSTLIB="${D}/${GAMES_DATADIR}/${PN}" \
 		INSTMAN=/usr/share/man \
-		|| die "make install failed"
+		|| die "emake install failed"
 	dodoc AUTHORS Changelog README*
 	prepgamesdirs
 }