gnome-extra/gnome-globalmenu: fix repoman warnings and update ebuild style

4 files changed, 48 insertions, 42 deletions

diff --git a/gnome-extra/gnome-globalmenu/Manifest b/gnome-extra/gnome-globalmenu/Manifest
index 1eae72e..d110816 100644
--- a/gnome-extra/gnome-globalmenu/Manifest
+++ b/gnome-extra/gnome-globalmenu/Manifest
@@ -1 +1,11 @@
-DIST gnome-globalmenu-0.7.10.tar.bz2 565247 RMD160 c4cea0ead15ac76255e5ec1a8db82c8bf2d0bdf0 SHA1 0b1a845ea038b4f44e28112463fec7aac300a0b6 SHA256 5ce762e99ad033a64bb99ebc7d30159ee3225a88663e1d8585a8499174a12b89
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+DIST gnome-globalmenu-0.7.10.tar.bz2 565247 SHA256 5ce762e99ad033a64bb99ebc7d30159ee3225a88663e1d8585a8499174a12b89
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREKAAYFAlCumnUACgkQ1fmVwcYIWAbPbgCeI/nGUGnkcqpCYeZBoLNkJwaf
+3MMAoM+swvepyotkZQToGEl1oLZm4IdC
+=iWUw
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-globalmenu/gnome-globalmenu-0.7.10.ebuild b/gnome-extra/gnome-globalmenu/gnome-globalmenu-0.7.10.ebuild
index 998bef5..fbb879d 100644
--- a/gnome-extra/gnome-globalmenu/gnome-globalmenu-0.7.10.ebuild
+++ b/gnome-extra/gnome-globalmenu/gnome-globalmenu-0.7.10.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="3"
+EAPI="4"
 GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
 
-inherit autotools eutils gnome2
+inherit eutils gnome2
 
 MY_P=${P/_p/_}
 
@@ -22,7 +23,7 @@ RDEPEND=">=x11-libs/gtk+-2.10:2
 	>=dev-libs/glib-2.10:2
 	gnome-base/gconf:2
 	>=x11-libs/libwnck-2.16:1
-	>=gnome-base/gnome-menus-2.16
+	>=gnome-base/gnome-menus-2.16:0
 	>=x11-libs/libX11-1.1.0
 	gnome? (
 		>=gnome-base/gnome-panel-2.16
@@ -32,12 +33,12 @@ RDEPEND=">=x11-libs/gtk+-2.10:2
 "
 DEPEND="${RDEPEND}
 	dev-util/intltool
-	dev-util/pkgconfig
+	virtual/pkgconfig
 	>=dev-lang/vala-0.7.7:0.10"
 
 S="${WORKDIR}/${MY_P}"
 
-pkg_setup() {
+src_prepare() {
 	DOCS="AUTHORS ChangeLog NEWS README*"
 	G2CONF="${G2CONF}
 		--docdir=/usr/share/doc/${PF}
@@ -47,10 +48,6 @@ pkg_setup() {
 		VALAC_BIN=$(type -P valac-0.10)"
 		# Does not enable anything
 		#$(use_with introspection gir)
-}
-
-src_prepare() {
-	gnome2_src_prepare
 
 	# Append missing files
 	cat >>po/POTFILES.in <<EOF
@@ -66,9 +63,5 @@ libserver/widgets/menuitem.c
 tools/globalmenu-settings.c
 EOF
 
-}
-
-src_install() {
-	gnome2_src_install
-	find "${ED}" -name "*.la" -delete
-}
+	gnome2_src_prepare
+}
\ No newline at end of file
diff --git a/gnome-extra/gnome-globalmenu/gnome-globalmenu-9999.ebuild b/gnome-extra/gnome-globalmenu/gnome-globalmenu-9999.ebuild
index 7ebcfe1..5126942 100644
--- a/gnome-extra/gnome-globalmenu/gnome-globalmenu-9999.ebuild
+++ b/gnome-extra/gnome-globalmenu/gnome-globalmenu-9999.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
 
 inherit autotools eutils gnome2
 
@@ -22,33 +24,24 @@ HOMEPAGE="http://code.google.com/p/gnome2-globalmenu/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="gnome test xfce"
+IUSE="gnome +introspection xfce"
 
-# XXX: vala dependency raised for build issues
-RDEPEND=">=x11-libs/gtk+-2.10.0
-	>=dev-libs/glib-2.10.0
-	>=gnome-base/gconf-2
-	>=x11-libs/libwnck-2.16.0
-	>=gnome-base/gnome-menus-2.16.0
+RDEPEND=">=x11-libs/gtk+-2.10:2
+	>=dev-libs/glib-2.10:2
+	gnome-base/gconf:2
+	>=x11-libs/libwnck-2.16:1
+	>=gnome-base/gnome-menus-2.16:0
+	>=x11-libs/libX11-1.1.0
 	gnome? (
-		>=gnome-base/gnome-panel-2.16.0
+		>=gnome-base/gnome-panel-2.16
 		>=x11-libs/libnotify-0.4.4 )
 	xfce? (
 		>=xfce-base/xfce4-panel-4.4.3 )
-	>=x11-libs/libX11-1.1.0"
+"
 DEPEND="${RDEPEND}
 	dev-util/intltool
-	dev-util/pkgconfig
-	>=dev-lang/vala-0.7.7"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--without-gir
-		--docdir=/usr/share/doc/${PF}
-		$(use_enable test tests)
-		$(use_with gnome gnome-panel)
-		$(use_with xfce xfce4-panel)"
-}
+	virtual/pkgconfig
+	>=dev-lang/vala-0.7.7:0.10"
 
 src_unpack() {
 	if [[ ${PV} == "9999" ]]; then
@@ -60,7 +53,14 @@ src_unpack() {
 }
 
 src_prepare() {
-	gnome2_src_prepare
+	G2CONF="${G2CONF}
+		--docdir=/usr/share/doc/${PF}
+		--without-gir
+		$(use_with gnome gnome-panel)
+		$(use_with xfce xfce4-panel)
+		VALAC_BIN=$(type -P valac-0.10)"
+		# Does not enable anything
+		#$(use_with introspection gir)
 
 	# INSTALL is not useful or existing depending on version
 	sed 's/\(doc_DATA.*\)INSTALL/\1/' \
@@ -69,6 +69,7 @@ src_prepare() {
 	# Fix compilation problem with --as-needed
 	epatch "${FILESDIR}/${PN}-0.7.7-as-needed.patch"
 
-	intltoolize --force --copy --automake || die "intltoolize failed"
 	AT_M4DIR="autotools" eautoreconf
-}
+
+	gnome2_src_prepare
+}
\ No newline at end of file
diff --git a/gnome-extra/gnome-globalmenu/metadata.xml b/gnome-extra/gnome-globalmenu/metadata.xml
index bb3fcca..d5b1181 100644
--- a/gnome-extra/gnome-globalmenu/metadata.xml
+++ b/gnome-extra/gnome-globalmenu/metadata.xml
@@ -6,6 +6,8 @@
 	<name>Gilles Dartiguelongue</name>
 </maintainer>
 <use>
+	<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for
+		introspection</flag>
 	<flag name="xfce">Support for Xfce desktop</flag>
 </use>
 <upstream>