Fix gtk+-2 dependency, clean up the ebuild a bit

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

4 files changed, 18 insertions, 43 deletions

diff --git a/app-office/imposter/ChangeLog b/app-office/imposter/ChangeLog
index 1ba795ba6910..a88ffc6d960c 100644
--- a/app-office/imposter/ChangeLog
+++ b/app-office/imposter/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/imposter
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/imposter/ChangeLog,v 1.15 2008/08/03 10:36:55 ulm Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/imposter/ChangeLog,v 1.16 2011/03/13 19:54:43 suka Exp $
+
+  13 Mar 2011; Andreas Proschofsky <suka@gentoo.org> -imposter-0.2.ebuild,
+  imposter-0.3.ebuild:
+  Fix gtk+-2 dependency, clean up the ebuild a bit
 
   03 Aug 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
   Add USE flag description to metadata wrt GLEP 56.
diff --git a/app-office/imposter/Manifest b/app-office/imposter/Manifest
index 42eb3a402de8..f4e55ad25356 100644
--- a/app-office/imposter/Manifest
+++ b/app-office/imposter/Manifest
@@ -1,17 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX imposter-0.3-ignore-modifiers.patch 695 RMD160 f4d23cdf1299cd7915688f396bf65c596f148a13 SHA1 d6363b358ea7808687274e5020ce002441b1a1dd SHA256 ca984b39350c1c40541f23578cae4d7f5e2fd461d64f25a48844d835bd204c74
-DIST imposter-0.2.tar.gz 165306 RMD160 5196e5795cd053062f40037746c04727f12f5766 SHA1 cd5b8c916d87691dc33d03607460d1939ff380d2 SHA256 99bbac3e943ee78ba74e94c6c4ac36f9d2f6dbf406572deee4999cf5ff72d753
 DIST imposter-0.3.tar.gz 169592 RMD160 7e01b354fe28db286e3bfdc1499f077e1c8afac6 SHA1 70ebda94cd62dcc65c9c53a4c7cb420f4b8b694b SHA256 53b67c08477623bb03436f79bf2ca859d7cd9684c57775ea539e1db449658236
-EBUILD imposter-0.2.ebuild 632 RMD160 356ac872aa3cae7fc7c5691740c8896240c1cc63 SHA1 3b322d75e77f449bd967dd454b825f1abade33ac SHA256 2987387342df373143daa7a5411c983fb3eb46573568fbdd515ee105d78cc533
-EBUILD imposter-0.3.ebuild 1070 RMD160 c84f6b1d7d24e4b16ae4f376388526959f2bc268 SHA1 e9ca4f35fc94e5fcce1892c7fc03febb1301c60e SHA256 4730ec5dcbbd2eb96dd0f869fb432ec5744b07dbb77b6de1a6e8feae3a141ed6
-MISC ChangeLog 1942 RMD160 81eacc8fa91becf8694ce7768997e68a4f0ac126 SHA1 da5186a93d68bfa802bcff240f0c73ca0de64ad2 SHA256 fbe65706f290f1bea907941e59d76aeece52d7bd41524e9fdeb29d0dae999f9f
+EBUILD imposter-0.3.ebuild 1078 RMD160 2e766b95415b178f088c36dd13dc021023650c0b SHA1 cacdf88882beddd1266ff567b9378e37b44134e5 SHA256 bf4a93257410855fedf7ea62ad10fca6815cead7ecf4050af10a49a136103b41
+MISC ChangeLog 2093 RMD160 653aa258e3c0bd237d6e9453ed03e1bc3a8ef25f SHA1 1e86120e42184d6da89bd9195ba0d556850762fd SHA256 511b271bbeb0b73f70017ef84aaaf6e390544e685201086d7fd38ced607a8536
 MISC metadata.xml 270 RMD160 42c1246314291ebd6c1169da40a6edde8cf38332 SHA1 28a3167a94486a6deeaffe7080954d3d891830d6 SHA256 cdd9b8ab5560425d375f6edf30098236d39f6f8b56ba64dc9422786a62b15912
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-iEYEARECAAYFAkiVilUACgkQOeoy/oIi7uwfagCg0cIRFaciSGR+hKMd2KfAgGDC
-CScAoNwG/i187RdkTERl8mLyLymgfSlT
-=iFih
------END PGP SIGNATURE-----
diff --git a/app-office/imposter/imposter-0.2.ebuild b/app-office/imposter/imposter-0.2.ebuild
deleted file mode 100644
index f15e791e3888..000000000000
--- a/app-office/imposter/imposter-0.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/imposter/imposter-0.2.ebuild,v 1.9 2008/05/19 07:18:49 drac Exp $
-
-DESCRIPTION="Imposter is a standalone viewer for the presentations created by OpenOffice.org Impress software"
-HOMEPAGE="http://imposter.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-}
diff --git a/app-office/imposter/imposter-0.3.ebuild b/app-office/imposter/imposter-0.3.ebuild
index 7538783adbf6..15cba77675db 100644
--- a/app-office/imposter/imposter-0.3.ebuild
+++ b/app-office/imposter/imposter-0.3.ebuild
@@ -1,6 +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/app-office/imposter/imposter-0.3.ebuild,v 1.5 2008/05/22 18:37:24 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/imposter/imposter-0.3.ebuild,v 1.6 2011/03/13 19:54:43 suka Exp $
+
+EAPI="2"
 
 inherit eutils
 
@@ -13,22 +15,23 @@ SLOT="0"
 KEYWORDS="~amd64 ppc x86"
 IUSE="iksemel nls"
 
-RDEPEND=">=x11-libs/gtk+-2.4
+RDEPEND=">=x11-libs/gtk+-2.4:2
 	iksemel? ( dev-libs/iksemel )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	nls? ( sys-devel/gettext )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	# Patch by Recai OktaÅŸ <roktas@omu.edu.tr>, backported from CVS...
 	epatch "${FILESDIR}"/${P}-ignore-modifiers.patch
 }
 
-src_compile() {
+src_configure() {
 	# FIXME. Iksemel is automagic depend.
 	econf --disable-dependency-tracking $(use_enable nls)
+}
+
+src_compile() {
 	emake || die "emake failed."
 }