remove svg USE-flag, as disabling it is broken. media-libs/sdl-image needs to be built with png support, bug #255529

Package-Manager: portage-2.2_rc23/cvs/Linux i686

3 files changed, 27 insertions, 25 deletions

diff --git a/media-gfx/tuxpaint/ChangeLog b/media-gfx/tuxpaint/ChangeLog
index 8e3e55d1001b..f76d1aedb9b7 100644
--- a/media-gfx/tuxpaint/ChangeLog
+++ b/media-gfx/tuxpaint/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/tuxpaint
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint/ChangeLog,v 1.49 2008/12/21 15:24:39 maekke Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint/ChangeLog,v 1.50 2009/01/21 23:13:09 maekke Exp $
+
+  21 Jan 2009; Markus Meier <maekke@gentoo.org> tuxpaint-0.9.20.ebuild:
+  remove svg USE-flag, as disabling it is broken. media-libs/sdl-image needs
+  to be built with png support, bug #255529
 
 *tuxpaint-0.9.20 (21 Dec 2008)
 
diff --git a/media-gfx/tuxpaint/Manifest b/media-gfx/tuxpaint/Manifest
index 19c73c7433fe..c6747fb9beb7 100644
--- a/media-gfx/tuxpaint/Manifest
+++ b/media-gfx/tuxpaint/Manifest
@@ -8,13 +8,13 @@ AUX tuxpaint-0.9.20-gentoo.patch 6029 RMD160 0dacd2fc3acf6e32b9720b79bf749f5d391
 DIST tuxpaint-0.9.19.tar.gz 8474855 RMD160 52a21da2c8e5c15af4a06f4592245434dfdbaa33 SHA1 6e2f806e8216808f602cccef45fb538c6f620578 SHA256 72f1e1de7ff2c232e05e62f9eca30a757806253cf19512843fed49bc8cf2dc45
 DIST tuxpaint-0.9.20.tar.gz 8622291 RMD160 876616232cc8d78f597df59124eaa0293a3db020 SHA1 059593dcaeb0aa0b403322567d7d482d2abf0a6c SHA256 02daec451bf0ad2a6f32b5077e337df3a15df83b00df5943cfb10067896210bc
 EBUILD tuxpaint-0.9.19.ebuild 1684 RMD160 17ed2e076255da94358e3323672b05e51511720b SHA1 f1fefdd718a8e53a9346504f7c14da0e122c4ec9 SHA256 ed3a1d3e1746d5a09410dd60e26b28dcdaf19e9751640ed2deb143e99e1ce455
-EBUILD tuxpaint-0.9.20.ebuild 1664 RMD160 af57409b0561de94daf51f35fd2309fba8ba1f72 SHA1 2cced9a2ebeed697a40ba7f3381a0d336a6706c3 SHA256 1c2dcbaf85c8a2b44eb43228c554d374b2ca6ce156b706f56fcf683a13b3284d
-MISC ChangeLog 7933 RMD160 ad7b2cfededad7d3fba7c8b28e7f4b5cc950854e SHA1 6c6dd6c4a8346a498866e7e5ec202ea3f283bd33 SHA256 4223fe647d8a24eef152afc6f738bb982b32bef4996a93a78bc536083b2fca77
+EBUILD tuxpaint-0.9.20.ebuild 1604 RMD160 1cc273011cee01ffdba66cee9f2cfedd3fd997b2 SHA1 1556474938877d5e6f126be9755166b4b9d582ec SHA256 7726c421477655fa8ead0d8619b9d8142ced69328790216ac10076e434937cf7
+MISC ChangeLog 8127 RMD160 a1c00c7b3f97d9482f348b7a7d4b34181166e0a4 SHA1 c77b9d5ada3422721c5f543dbb25ab5a67c3a9f2 SHA256 cd9bc3b196e8eaa1badb3a4b9d4845159fa32213f18a35cd84162df35430a175
 MISC metadata.xml 527 RMD160 c0e08a63a2d783392a281c3b681622f0d2456cc5 SHA1 26f1bdca44c61da82468ea29c6973634a3d929df SHA256 54bee60372a1ddd02970106c0439a3f5f1ca7e3e081dc997caccf4002b3b47f5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAklOX/sACgkQkKaRLQcq0GKIcQCfQJk+8ft7yZ/bz2tBRrIhdUxw
-ZNwAnR5sXbqqXigF2//qiCKKctZsnkdW
-=rGu1
+iEYEARECAAYFAkl3rFMACgkQkKaRLQcq0GIw8wCfaNzcmZP94bYNZFEy0fBMPndr
+0L4AmwemJuuaZ6lIuogfVzPQAHdaNSoT
+=Ed5u
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.20.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.20.ebuild
index f1de2a9d806b..3614260ed0c4 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.20.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.20.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint/tuxpaint-0.9.20.ebuild,v 1.1 2008/12/21 15:24:39 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint/tuxpaint-0.9.20.ebuild,v 1.2 2009/01/21 23:13:09 maekke Exp $
+
+EAPI="2"
 
 inherit eutils gnome2-utils multilib toolchain-funcs
 
@@ -12,25 +14,22 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 
-IUSE="nls svg"
+IUSE="nls"
 
-DEPEND="media-libs/libsdl
-	media-libs/sdl-image
-	media-libs/sdl-ttf
-	media-libs/sdl-mixer
-	media-libs/sdl-pango
+DEPEND="
+	app-text/libpaper
+	gnome-base/librsvg
 	>=media-libs/libpng-1.2
 	>=media-libs/freetype-2
-	app-text/libpaper
-	nls? ( sys-devel/gettext )
-	svg? (
-		gnome-base/librsvg
-		x11-libs/cairo )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+	media-libs/libsdl
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer
+	media-libs/sdl-pango
+	media-libs/sdl-ttf
+	x11-libs/cairo
+	nls? ( sys-devel/gettext )"
 
+src_prepare() {
 	# Sanitize the Makefile and correct a few other issues.
 	epatch "${FILESDIR}/${P}-gentoo.patch"
 	sed -i -e "s|linux_PREFIX:=/usr/local|linux_PREFIX:=/usr|" Makefile || die
@@ -43,7 +42,6 @@ src_compile() {
 	local myopts=""
 
 	use nls && myopts="${myopts} ENABLE_GETTEXT=1"
-	use svg || myopts="${myopts} nosvg"
 
 	# emake may break things
 	make CC="$(tc-getCC)" ${myopts} || die "Compilation failed"