Use SLOT dependencies for x11-libs/gtk+. Remove useless libtool files. Fix documentation path.

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

2 files changed, 22 insertions, 24 deletions

diff --git a/media-gfx/gimageview/ChangeLog b/media-gfx/gimageview/ChangeLog
index f3e4013e08f8..8eec5cea81be 100644
--- a/media-gfx/gimageview/ChangeLog
+++ b/media-gfx/gimageview/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/gimageview
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimageview/ChangeLog,v 1.24 2008/12/21 13:14:09 ssuominen Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimageview/ChangeLog,v 1.25 2011/03/28 19:46:44 ssuominen Exp $
+
+  28 Mar 2011; Samuli Suominen <ssuominen@gentoo.org>
+  gimageview-0.2.27-r2.ebuild:
+  Use SLOT dependencies for x11-libs/gtk+. Remove useless libtool files. Fix
+  documentation path.
 
   21 Dec 2008; <ssuominen@gentoo.org> +files/gimageview-0.2.27-gtk2.patch,
   gimageview-0.2.27-r2.ebuild:
diff --git a/media-gfx/gimageview/gimageview-0.2.27-r2.ebuild b/media-gfx/gimageview/gimageview-0.2.27-r2.ebuild
index 090bd6eb8cf4..73b645f8c49e 100644
--- a/media-gfx/gimageview/gimageview-0.2.27-r2.ebuild
+++ b/media-gfx/gimageview/gimageview-0.2.27-r2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.7 2008/12/21 13:14:09 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimageview/gimageview-0.2.27-r2.ebuild,v 1.8 2011/03/28 19:46:44 ssuominen Exp $
 
+EAPI=2
 inherit eutils libtool
 
 DESCRIPTION="Powerful GTK+ based image & movie viewer"
@@ -11,11 +12,10 @@ SRC_URI="mirror://sourceforge/gtkmmviewer/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~hppa ppc ppc64 x86"
-# mng, xine, and mplayer are local flags
 IUSE="nls imlib wmf mng svg xine mplayer"
 
-RDEPEND=">=x11-libs/gtk+-2
-	media-libs/libpng
+RDEPEND="x11-libs/gtk+:2
+	>=media-libs/libpng-1.4
 	wmf? ( >=media-libs/libwmf-0.2.8 )
 	mng? ( >=media-libs/libmng-1.0.3 )
 	svg? ( >=gnome-base/librsvg-1.0.3 )
@@ -26,16 +26,16 @@ DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 	dev-util/pkgconfig"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-sort_fix.diff \
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-sort_fix.diff \
 		"${FILESDIR}"/${P}-gtk12_fix.diff \
 		"${FILESDIR}"/${P}-gtk2.patch
+
 	elibtoolize
 }
 
-src_compile() {
+src_configure() {
 	econf \
 		$(use_enable nls) \
 		$(use_with wmf libwmf) \
@@ -44,20 +44,13 @@ src_compile() {
 		$(use_with xine) \
 		$(use_enable mplayer) \
 		--with-gtk2 \
-		--enable-splash || die
-
-	emake || die
+		--enable-splash
 }
 
 src_install() {
-	# make DESTDIR=${D} install doesn't work
-	einstall desktopdir="${D}"/usr/share/applications || die
-}
+	einstall \
+		desktopdir="${D}"/usr/share/applications \
+		gimv_docdir="${D}"/usr/share/doc/${PF} || die
 
-pkg_postinst() {
-	elog ""
-	elog "If you want to open archived files, you have to emerge"
-	elog "'app-arch/rar' and/or 'app-arch/lha'."
-	elog "e.g.) # emerge app-arch/rar"
-	elog ""
+	find "${D}" -name '*.la' -exec rm -f {} +
 }