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

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

3 files changed, 16 insertions, 29 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/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."
 }