temporarily drop USE=xine

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

4 files changed, 88 insertions, 12 deletions

diff --git a/media-gfx/gimageview/ChangeLog b/media-gfx/gimageview/ChangeLog
index edcbcd4f638c..a3c00d1642aa 100644
--- a/media-gfx/gimageview/ChangeLog
+++ b/media-gfx/gimageview/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/gimageview
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimageview/ChangeLog,v 1.26 2011/08/07 06:05:45 ssuominen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimageview/ChangeLog,v 1.27 2012/01/09 16:12:57 ssuominen Exp $
+
+*gimageview-0.2.27-r3 (09 Jan 2012)
+
+  09 Jan 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +gimageview-0.2.27-r3.ebuild:
+  Temporarily remove USE="xine" for missing xine-lib >= 1.2.0 support wrt
+  #397639
 
   07 Aug 2011; Samuli Suominen <ssuominen@gentoo.org>
   gimageview-0.2.27-r2.ebuild, +files/gimageview-0.2.27-libpng15.patch:
diff --git a/media-gfx/gimageview/Manifest b/media-gfx/gimageview/Manifest
index 082318acff4f..adb7ea2e92a0 100644
--- a/media-gfx/gimageview/Manifest
+++ b/media-gfx/gimageview/Manifest
@@ -1,18 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX gimageview-0.2.27-gtk12_fix.diff 272 RMD160 c1271721304b56c3edb42dd4ea105c40f7464499 SHA1 53fb9d2f22079cfe7c0679ccba7e7ae1b931aa63 SHA256 4aae464b117de3f86d4280a9dc25c24dfb987e08cbe7bc59fb16c5c1d37abd71
 AUX gimageview-0.2.27-gtk2.patch 624 RMD160 308bc209c09cb5b7d64f5d9e6683cd72cf6a212f SHA1 105e9a0368665199cc51672214ff45511cfdd32a SHA256 db861067fd6a67ce47f1065fe99ed0ebf8ad0d10742bbd4ff2322fadc5d53991
 AUX gimageview-0.2.27-libpng15.patch 601 RMD160 ba486ead1e69ede8fe5bc4a8a72d5959d54b880d SHA1 bc5868df1ad55d15bcd8d18dce46029ba691d5a1 SHA256 04b468f51bb6b806a2d46860a2bc53eda7bcb49590d918482498ccbde8b9461f
 AUX gimageview-0.2.27-sort_fix.diff 714 RMD160 bd477ae61ca1a592c2d919299b0612f5284af89c SHA1 2429a326b55f77336876ddefa3c48ca4d2fcbd84 SHA256 fbb4e239b49daad78d27d5cd6b029ab1f68813fe4ca07be090a45206a1c72100
 DIST gimageview-0.2.27.tar.gz 1348286 RMD160 1d35b3a1b453f87dc232b84407524c3011ec91eb SHA1 333f0682e4f8f8ead4abb24f6eddf86f776c2478 SHA256 4bc899d734e9833478c1ae8fc6d9db0971d812aeefe6f1295b5edbd4e4639060
-EBUILD gimageview-0.2.27-r2.ebuild 1556 RMD160 a86764fbcd98f41fe62ef98446413a13fd001652 SHA1 9bb7ceab69af343e83d926b89569afd75b463c56 SHA256 0277cd59b7496ed7d1d2139affe452a3c20c4e91b5e9992ccd4fffa1a5317caa
-MISC ChangeLog 3782 RMD160 79b8bc7644e3b082da89753fd042960f27945121 SHA1 b956a4605237a3d7bf5ca9ad371693fb37e8c210 SHA256 6ac94485799431e23c9b039e0988ba55ac884e7ac27c250a60dda194c1dbeddf
+EBUILD gimageview-0.2.27-r2.ebuild 1530 RMD160 b595b9f88f27b8c772ca2e19daecbf70ccafd982 SHA1 828f95cdf9807d4a640627afe48a8fb7398fbea7 SHA256 87bd48060cfb7d841e146d6c919daef1caaa7c8e08cdd902d32773dcd61d7ac7
+EBUILD gimageview-0.2.27-r3.ebuild 1628 RMD160 ab150f422668ecfc7eca89a2e5a2702c63a217b1 SHA1 e2b32e0310b330793fa3c2854b0fae5dc84724d0 SHA256 827cc93bf80441a18b041ce937591401ab49a9b700ae4d951816636792e521c7
+MISC ChangeLog 3990 RMD160 84450b6557910bbdbfbca761ade6886b64158140 SHA1 149d9093a06f1246a5673198a3027bf6afbb1dd3 SHA256 001bfc6476d609488f863d95071510759bcec45190581d6f406d25f62668a2e6
 MISC metadata.xml 162 RMD160 724f25e8bd2d17056a9f820449e0ddc858f31cce SHA1 620b205b2cddc55f63199267eeb30e9f4c6a817b SHA256 7cccbeab15ef93a962010750e32971ffff1226321adc83df7ff572dea8ff63c2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk4+KnQACgkQXkR9YqOcLPGj9wD8CQav4o1+YAXV5PVwe5DdE8Up
-1lHp3GjtPyr1YGN9Kq4A/32dwt/jGxAjCDgm8fG4s2lFMXUpzq2g8lTxCdTskUJz
-=JsP6
+iQEcBAEBAgAGBQJPCxG3AAoJEEdUh39IaPFNfWAH/2VnPVB32e2OtoI9U4Ct+6bX
+TAQw+q5r9CYtaeS/zk9MDMBdH/UdBmUbBkK60apSF0otBbGAnwV7Jj1469cBYiiH
+DSlTEOZSFvji81wsoJxztVCGLA7d5vNLe+V6Mz+rs1BgZBBNAntQB4JwAlrLy9lc
+ryp9aSxwqd8ItnjjEzbQ6n9GXgHbncwqvqKuwE1JshcgmZV4qqGL/Tku51Eb9Fa6
+ZA9bLq7e1ZyiJh54nIc4BpCALEFS6AuruM+AtKgCHijoL7pdvzLL14jikZoH/vYT
+Wa+85LnZTVDmKQF/Rv/TB7zEEfAMmA8LJ+u5M/Du8OzMfk8gGJEntT8ybX00mbs=
+=GP5S
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/gimageview/gimageview-0.2.27-r2.ebuild b/media-gfx/gimageview/gimageview-0.2.27-r2.ebuild
index 7f652c0ce991..8479f8ca4c69 100644
--- a/media-gfx/gimageview/gimageview-0.2.27-r2.ebuild
+++ b/media-gfx/gimageview/gimageview-0.2.27-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimageview/gimageview-0.2.27-r2.ebuild,v 1.9 2011/08/07 06:05:45 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimageview/gimageview-0.2.27-r2.ebuild,v 1.10 2012/01/09 16:12:57 ssuominen Exp $
 
 EAPI=4
 inherit eutils libtool
@@ -14,7 +14,6 @@ SLOT="0"
 KEYWORDS="amd64 ~hppa ppc ppc64 x86"
 IUSE="nls wmf mng svg xine mplayer"
 
-# note: bzip2 is for libbz2
 RDEPEND="app-arch/bzip2
 	x11-libs/gtk+:2
 	>=media-libs/libpng-1.4
@@ -59,5 +58,5 @@ src_install() {
 		desktopdir="${D}"usr/share/applications \
 		gimv_docdir="${D}"usr/share/doc/${PF}
 
-	find "${D}"usr -name '*.la' -exec rm -f {} +
+	find "${ED}"usr -name '*.la' -exec rm -f {} +
 }
diff --git a/media-gfx/gimageview/gimageview-0.2.27-r3.ebuild b/media-gfx/gimageview/gimageview-0.2.27-r3.ebuild
new file mode 100644
index 000000000000..8ba55df25036
--- /dev/null
+++ b/media-gfx/gimageview/gimageview-0.2.27-r3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimageview/gimageview-0.2.27-r3.ebuild,v 1.1 2012/01/09 16:12:58 ssuominen Exp $
+
+# TODO: USE xine could be restored if support for xine-lib-1.2.x
+# is patched in wrt #397639
+
+EAPI=4
+inherit eutils libtool
+
+DESCRIPTION="Powerful GTK+ based image & movie viewer"
+HOMEPAGE="http://gtkmmviewer.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gtkmmviewer/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="nls wmf mng svg mplayer" #xine
+
+RDEPEND="app-arch/bzip2
+	x11-libs/gtk+:2
+	>=media-libs/libpng-1.2:0
+	x11-libs/libXinerama
+	wmf? ( >=media-libs/libwmf-0.2.8 )
+	mng? ( media-libs/libmng )
+	svg? ( gnome-base/librsvg )
+	mplayer? ( media-video/mplayer )"
+#xine? ( media-libs/xine-lib )
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	dev-util/pkgconfig"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-sort_fix.diff \
+		"${FILESDIR}"/${P}-gtk12_fix.diff \
+		"${FILESDIR}"/${P}-gtk2.patch \
+		"${FILESDIR}"/${P}-libpng15.patch
+
+	# desktop-file-validate
+	sed -i -e '/^Term/s:0:false:' -e '/^Icon/s:.png::' etc/${PN}.desktop.in || die
+
+	elibtoolize
+}
+
+src_configure() {
+	econf \
+		--disable-imlib \
+		$(use_enable nls) \
+		--enable-splash \
+		$(use_enable mplayer) \
+		--with-gtk2 \
+		$(use_with mng libmng) \
+		$(use_with svg librsvg) \
+		$(use_with wmf libwmf) \
+		--without-xine
+}
+
+src_install() {
+	einstall \
+		desktopdir="${D}"usr/share/applications \
+		gimv_docdir="${D}"usr/share/doc/${PF}
+
+	find "${ED}"usr -name '*.la' -exec rm -f {} +
+}