gnome-extra/gnome-globalmenu: bump to 0.7.10

2 files changed, 30 insertions, 17 deletions

diff --git a/gnome-extra/gnome-globalmenu/Manifest b/gnome-extra/gnome-globalmenu/Manifest
index 5446612..f478931 100644
--- a/gnome-extra/gnome-globalmenu/Manifest
+++ b/gnome-extra/gnome-globalmenu/Manifest
@@ -1,6 +1,6 @@
 AUX gnome-globalmenu-0.7.7-as-needed.patch 502 RMD160 e358deb2b669b917bc21b3bda518141c2729d6bb SHA1 5b043c887a6f20f4d4cfb5632cb3060eaf17a994 SHA256 477fd29377204445b11304fe0c3ddab397850f06faf70d58c473d5a8de951663
-DIST gnome-globalmenu-0.7.9.tar.bz2 598736 RMD160 a1b05817aa164bb94d2f9835b9d90b39086d1a0a SHA1 7a51f2927f0d59c29e131464586734ad29f87903 SHA256 a5ac112169c175ab2ee6f4ba02655f9af3b7f1a9294056506ad92abb05b1159c
-EBUILD gnome-globalmenu-0.7.9.ebuild 1335 RMD160 f2448599b44300a69d5ae337163908c2ed3b78e8 SHA1 40c9aa935f41ac85902ad416831de6f37e0bbda5 SHA256 b75fde3d3a687e1a75c93fdb33d78e148ae226cd557f93a8a92e05071c899bce
+DIST gnome-globalmenu-0.7.10.tar.bz2 565247 RMD160 c4cea0ead15ac76255e5ec1a8db82c8bf2d0bdf0 SHA1 0b1a845ea038b4f44e28112463fec7aac300a0b6 SHA256 5ce762e99ad033a64bb99ebc7d30159ee3225a88663e1d8585a8499174a12b89
+EBUILD gnome-globalmenu-0.7.10.ebuild 1534 RMD160 1e36dd7d9c7aaa327426bf074bd5d6c29af05877 SHA1 23345cc09b43ec0b42eb15dd0d96f09530e76b9d SHA256 51971735bae97c1ed3dc7f6bfa2cbe82f7687776d5e65da3c588886358618f98
 EBUILD gnome-globalmenu-9999.ebuild 1653 RMD160 3a4da0fc2268255078bc973899a5ef09c97054ea SHA1 65e875cea13a09ae09e2e94f34552d4fa1083515 SHA256 464bba816369df36d886f68237558ee07ce3f7187fed724cac5a099dae5d5499
 MISC ChangeLog 406 RMD160 4f48431a5b6893400f7507a28f384e00d5bdc99e SHA1 f62ac85d3b0a6498f241533ad6fad06190714523 SHA256 ef1f34dffbc9d0714f0ed61051c55bd11c911eab2697f0bb2afd20df2b28755d
 MISC metadata.xml 294 RMD160 48cf3784538ca27f89b2c2e03b34283197cba253 SHA1 113567b69a0b2caaf3632e5e5bed7656218dde8a SHA256 7ca1ffeb81230b4d6549e38a859ef2d1d1de560fbed967302effd11b977bf2c9
diff --git a/gnome-extra/gnome-globalmenu/gnome-globalmenu-0.7.9.ebuild b/gnome-extra/gnome-globalmenu/gnome-globalmenu-0.7.10.ebuild
index 1e2adba..998bef5 100644
--- a/gnome-extra/gnome-globalmenu/gnome-globalmenu-0.7.9.ebuild
+++ b/gnome-extra/gnome-globalmenu/gnome-globalmenu-0.7.10.ebuild
@@ -3,6 +3,7 @@
 # $Header: $
 
 EAPI="3"
+GCONF_DEBUG="no"
 
 inherit autotools eutils gnome2
 
@@ -15,45 +16,57 @@ SRC_URI="http://gnome2-globalmenu.googlecode.com/files/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="gnome test xfce"
+IUSE="gnome +introspection xfce"
 
 RDEPEND=">=x11-libs/gtk+-2.10:2
 	>=dev-libs/glib-2.10:2
-	>=gnome-base/gconf-2
-	>=x11-libs/libwnck-2.16
+	gnome-base/gconf:2
+	>=x11-libs/libwnck-2.16:1
 	>=gnome-base/gnome-menus-2.16
+	>=x11-libs/libX11-1.1.0
 	gnome? (
 		>=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"
+	>=dev-lang/vala-0.7.7:0.10"
 
 S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
 	DOCS="AUTHORS ChangeLog NEWS README*"
 	G2CONF="${G2CONF}
-		--without-gir
 		--docdir=/usr/share/doc/${PF}
-		$(use_enable test tests)
+		--without-gir
 		$(use_with gnome gnome-panel)
-		$(use_with xfce xfce4-panel)"
+		$(use_with xfce xfce4-panel)
+		VALAC_BIN=$(type -P valac-0.10)"
+		# Does not enable anything
+		#$(use_with introspection gir)
 }
 
-#src_prepare() {
-#	gnome2_src_prepare
+src_prepare() {
+	gnome2_src_prepare
 
-	# Fix compilation problem with --as-needed
-#	epatch "${FILESDIR}/${PN}-0.7.7-as-needed.patch"
+	# Append missing files
+	cat >>po/POTFILES.in <<EOF
+applet/applet.c
+applet/application.c
+applet/gtkextra-gconfdialog.c
+applet/main.c
+applet/switcher.c
+applet/workspaceselector.c
+globalmenu-plugin/module-main.c
+libserver/globalmenuitem.c
+libserver/widgets/menuitem.c
+tools/globalmenu-settings.c
+EOF
 
-#	intltoolize --force --copy --automake || die "intltoolize failed"
-#	AT_M4DIR="autotools" eautoreconf
-#}
+}
 
 src_install() {
 	gnome2_src_install