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

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

3 files changed, 24 insertions, 26 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/Manifest b/media-gfx/gimageview/Manifest
index 879c180255ff..bb88707bf8db 100644
--- a/media-gfx/gimageview/Manifest
+++ b/media-gfx/gimageview/Manifest
@@ -3,6 +3,6 @@ AUX gimageview-0.2.27-gtk2.patch 1030 RMD160 cbd839b6c21fbe8326461063df5deeaafe0
 AUX gimageview-0.2.27-sort_fix.diff 920 RMD160 c06ff47bcd3ea48c58975b4ef992e559085c0d7e SHA1 7e81fce94ab5ac89cb8cf71c0520556934922df9 SHA256 955aa19153dbfeda17404915ecad08e238b1f1f77aeadb6c0eecc7c376aeb5fe
 AUX gimv-gcc34.patch 851 RMD160 b553f5854e20bd32fc78af049ecfeb991bc5f54b SHA1 cc44d048344290496aa8fa2cec35662eb395b8ca SHA256 1a45e77459b74ed762c51ccbb330850e8739e5102562780f98c31817a7ff3d4d
 DIST gimageview-0.2.27.tar.gz 1348286 RMD160 1d35b3a1b453f87dc232b84407524c3011ec91eb SHA1 333f0682e4f8f8ead4abb24f6eddf86f776c2478 SHA256 4bc899d734e9833478c1ae8fc6d9db0971d812aeefe6f1295b5edbd4e4639060
-EBUILD gimageview-0.2.27-r2.ebuild 1604 RMD160 0fb7a6a8c5c644cb3000f4a90d14d8624a92f78a SHA1 e574f6c727d10c17fa3e2acd9b1116ed5b9d6fcd SHA256 47beb55d2ec06246aa9a842c68a7a92aec96487568411ea78ba04d6a98641395
-MISC ChangeLog 3346 RMD160 74bc89b9033ef901a7ffa4e73d1fbb87f8bd3013 SHA1 9af6fcdaa292aec0a7f03873bcfc61c80db862fd SHA256 2b54397c69131d3b5acee9da38363a8da52f813a5a38b7cacdf28db52ad4546d
+EBUILD gimageview-0.2.27-r2.ebuild 1402 RMD160 04532d069cd52d89424f1aed0ac4a55fb35463c1 SHA1 5b0654b44bd52c90e93b35aa0ee38308b296909f SHA256 26f18783e2220831e5fd2280134f81fb35018e68a0e7a4cabc43f12c7edd49a5
+MISC ChangeLog 3531 RMD160 7aa0687c9df3a19f2d819f80fabdd25eb323765f SHA1 3ef91b561a87c9065d573b40a2b046df59a01e3e SHA256 dfc8b7c2a74861ef006ac01adb88eec52ea6fc822cef091872f3e3d465dfd427
 MISC metadata.xml 162 RMD160 724f25e8bd2d17056a9f820449e0ddc858f31cce SHA1 620b205b2cddc55f63199267eeb30e9f4c6a817b SHA256 7cccbeab15ef93a962010750e32971ffff1226321adc83df7ff572dea8ff63c2
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 {} +
 }