Needs gnome-panel with bonobo support (bug #348157 with Olivier Crete approval), bump to eapi2 and use 'emake' instead of 'make' at install phase.

(Portage version: 2.1.9.30/cvs/Linux x86_64)

4 files changed, 14 insertions, 97 deletions

diff --git a/app-dicts/verbiste/ChangeLog b/app-dicts/verbiste/ChangeLog
index ab1ac261b74a..2e31f5fd8070 100644
--- a/app-dicts/verbiste/ChangeLog
+++ b/app-dicts/verbiste/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-dicts/verbiste
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/verbiste/ChangeLog,v 1.30 2009/02/09 20:33:11 nixnut Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/verbiste/ChangeLog,v 1.31 2011/01/11 20:55:21 pacho Exp $
+
+  11 Jan 2011; Pacho Ramos <pacho@gentoo.org> -verbiste-0.1.16.ebuild,
+  -verbiste-0.1.21.ebuild, verbiste-0.1.23.ebuild:
+  Needs gnome-panel with bonobo support (bug #348157 with Olivier Crete
+  approval), bump to eapi2 and use 'emake' instead of 'make' at install phase.
 
   09 Feb 2009; nixnut <nixnut@gentoo.org> verbiste-0.1.23.ebuild:
   ppc stable #245852
diff --git a/app-dicts/verbiste/verbiste-0.1.16.ebuild b/app-dicts/verbiste/verbiste-0.1.16.ebuild
deleted file mode 100644
index e059e7d7c76c..000000000000
--- a/app-dicts/verbiste/verbiste-0.1.16.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/verbiste/verbiste-0.1.16.ebuild,v 1.9 2008/08/17 15:15:43 tester Exp $
-
-inherit autotools eutils
-
-DESCRIPTION="French conjugation system"
-HOMEPAGE="http://www3.sympatico.ca/sarrazip/dev/verbiste.html"
-SRC_URI="http://www3.sympatico.ca/sarrazip/dev/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86"
-
-IUSE="gnome"
-
-RDEPEND=">=dev-libs/libxml2-2.4.0
-	gnome? ( >=gnome-base/gnome-panel-2.0
-		>=gnome-base/libgnomeui-2.0 )"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	dev-util/pkgconfig"
-
-#from enlightenment eclass
-gettext_modify() {
-#        use nls || return 0
-	cp $(type -P gettextize) "${T}"/ || die "could not copy gettextize"
-	sed -i \
-		-e 's:read dummy < /dev/tty::' \
-		"${T}"/gettextize
-}
-
-src_unpack() {
-	unpack ${A}
-
-	gettext_modify
-
-	cd "${S}"
-	"${T}"/gettextize --force --intl --copy
-	AT_M4DIR=macros eautoreconf
-}
-
-src_compile() {
-	econf $(use_with gnome) || die
-	emake || die
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die "can't install"
-	dodoc AUTHORS ChangeLog HACKING LISEZMOI NEWS README THANKS TODO
-}
diff --git a/app-dicts/verbiste/verbiste-0.1.21.ebuild b/app-dicts/verbiste/verbiste-0.1.21.ebuild
deleted file mode 100644
index 224d1ae1c3dc..000000000000
--- a/app-dicts/verbiste/verbiste-0.1.21.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/verbiste/verbiste-0.1.21.ebuild,v 1.3 2008/08/17 15:15:43 tester Exp $
-
-DESCRIPTION="French conjugation system"
-HOMEPAGE="http://sarrazip.com/dev/verbiste.html"
-SRC_URI="http://sarrazip.com/dev/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE="gnome gtk"
-
-RDEPEND=">=dev-libs/libxml2-2.4.0
-	gtk? ( >=x11-libs/gtk+-2.6 )
-	gnome? ( >=gnome-base/gnome-panel-2.0
-		>=gnome-base/libgnomeui-2.0 )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-#tests fails
-RESTRICT=test
-
-src_compile() {
-	econf \
-		$(use_with gtk gtk-app) \
-		$(use_with gnome gnome-app) \
-		$(use_with gnome gnome-applet) || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die "can't install"
-	dodoc AUTHORS ChangeLog HACKING LISEZMOI NEWS README THANKS TODO
-}
diff --git a/app-dicts/verbiste/verbiste-0.1.23.ebuild b/app-dicts/verbiste/verbiste-0.1.23.ebuild
index 0846acaab8fe..43a1b63aeb53 100644
--- a/app-dicts/verbiste/verbiste-0.1.23.ebuild
+++ b/app-dicts/verbiste/verbiste-0.1.23.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/verbiste/verbiste-0.1.23.ebuild,v 1.3 2009/02/09 20:33:11 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/verbiste/verbiste-0.1.23.ebuild,v 1.4 2011/01/11 20:55:21 pacho Exp $
+
+EAPI="2"
 
 DESCRIPTION="French conjugation system"
 HOMEPAGE="http://sarrazip.com/dev/verbiste.html"
@@ -14,21 +16,20 @@ IUSE="gnome gtk"
 
 RDEPEND=">=dev-libs/libxml2-2.4.0
 	gtk? ( >=x11-libs/gtk+-2.6 )
-	gnome? ( >=gnome-base/gnome-panel-2.0
+	gnome? ( || ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 )
 		>=gnome-base/libgnomeui-2.0 )"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-src_compile() {
+src_configure() {
 	econf \
 		$(use_with gtk gtk-app) \
 		$(use_with gnome gnome-app) \
 		$(use_with gnome gnome-applet) || die "econf failed"
-	emake || die "emake failed"
 }
 
 src_install() {
-	make install DESTDIR="${D}" || die "can't install"
+	emake install DESTDIR="${D}" || die "can't install"
 	dodoc AUTHORS ChangeLog HACKING LISEZMOI NEWS README THANKS TODO
 }