temporarily drop USE=xine

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

3 files changed, 76 insertions, 5 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/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 {} +
+}