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

Package-Manager: portage-2.1.9.30/cvs/Linux x86_64

5 files changed, 26 insertions, 103 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/Manifest b/app-dicts/verbiste/Manifest
index af434583a1d7..bfe1b1201d3d 100644
--- a/app-dicts/verbiste/Manifest
+++ b/app-dicts/verbiste/Manifest
@@ -1,8 +1,14 @@
-DIST verbiste-0.1.16.tar.gz 566860 RMD160 f2ec766a7996fbef44b6c1260897562d00a21ec4 SHA1 4ed24e3ee127cba67f32d054d97fe6a5ab961a97 SHA256 e39bc10a9bf9690a872ec7366bf0ca9d22c5642b2854909c0592786c419a61c6
-DIST verbiste-0.1.21.tar.gz 629542 RMD160 43dee0622abe1df7136a8a37c0dac66d0086ef02 SHA1 f11f4ebc0f09fe3f9c1a3039c58c27f6494f5f09 SHA256 7c6d75e25e53f364f7c309f702fe34806db2add2a2560ee5e56e48b56aceb18c
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST verbiste-0.1.23.tar.gz 640751 RMD160 5d149e069bc10e5039427ea1916800bba08d9a41 SHA1 5d1040b0ca459b65caaba684fcadef30ee7cec84 SHA256 fee17156f573bb433da1073811ffe5ce64f77dfb5c3797a500c42a7ced503e42
-EBUILD verbiste-0.1.16.ebuild 1189 RMD160 fe22c9acd8834036a1c576577d1462c7398aadf7 SHA1 ab1faf8c711c212e644785a7ab461924269c095d SHA256 dea1dfa4eb847d62dd4b271ba46ca10862c01d73f264e3b6109078861372298e
-EBUILD verbiste-0.1.21.ebuild 946 RMD160 981009dbee2c6a6137496d6e90cb1a69eb27b303 SHA1 10875267f0f2aa408e0643504b3b267e369738f0 SHA256 3019bbcf2e92c3412ce2140bc0abfcb25298c7efbbbfdeba0351d1066f222320
-EBUILD verbiste-0.1.23.ebuild 915 RMD160 0337eea66b05b5fb41dc2bf2fa7b7e3740c0d3ea SHA1 a321cfa5e3ef8920fa7c32ab80e2b239b6c55f73 SHA256 18aad436ba389f7015132ae61e0d490ad602f60ccc925cd9b5152675ae16db6e
-MISC ChangeLog 4014 RMD160 2b27d43c56c793d2c37874b77f39b13fbb74f3c9 SHA1 7b558ab2d2d9853c26946faf9df8ba57785918cf SHA256 a358f672a2523a1a69619fe17eee7d1c2a90793037225380ca2e4b33985f0744
+EBUILD verbiste-0.1.23.ebuild 936 RMD160 aa2a443d3ea266b4b26b4f0345d6ce5af2a8e9e2 SHA1 a7bfbe4f4b61581b359d206d76359628bbdeec7f SHA256 8fa8dfe116806ea9edbe7d3afc9c96556952ec52914d666616ceb361ee9e038a
+MISC ChangeLog 4287 RMD160 18ba5edd224d041a454a981486054aadc83dfe80 SHA1 36c2d073ae87a038c4e098574a11763968dafedc SHA256 8aee95b67a06b6fc37826118ef1f786e085310770f17d8b95a83e9e119116a96
 MISC metadata.xml 321 RMD160 8598149e903c3f1361a7a84034e4b1906c698395 SHA1 b4dfa395cb916424d1351abc69c64f0c1927392d SHA256 e4e3b6e04674128cd6c880e5d20f6034e825049cf799dbe29d95d6cc3e6bad74
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAk0sw78ACgkQCaWpQKGI+9RZKACeNaHeFkjnQkhncU2DimQLVLgY
+IDMAmgJlSPrKK38YDa8mthwtjHPkwQyH
+=K4cR
+-----END PGP SIGNATURE-----
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
 }