summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gentoo.org>2012-02-29 06:05:55 +0000
committerAlexandre Rostovtsev <tetromino@gentoo.org>2012-02-29 06:05:55 +0000
commitf8394bf9230195d5da8c4e182104423e4d053f4a (patch)
treee36974164091209852a48b791249f6c11cfa0d35 /gnome-base/gnome-menus
parentSet homepage to SF project page. (diff)
downloadgentoo-2-f8394bf9230195d5da8c4e182104423e4d053f4a.tar.gz
gentoo-2-f8394bf9230195d5da8c4e182104423e4d053f4a.tar.bz2
gentoo-2-f8394bf9230195d5da8c4e182104423e4d053f4a.zip
Add missing gnome-common dependency (bug #406231, thanks to Robin Bankhead for reporting). Add introspection.m4 for eautoreconf. Update to EAPI4.
(Portage version: 2.2.0_alpha89/cvs/Linux x86_64)
Diffstat (limited to 'gnome-base/gnome-menus')
-rw-r--r--gnome-base/gnome-menus/ChangeLog7
-rw-r--r--gnome-base/gnome-menus/gnome-menus-3.0.1-r1.ebuild19
2 files changed, 20 insertions, 6 deletions
diff --git a/gnome-base/gnome-menus/ChangeLog b/gnome-base/gnome-menus/ChangeLog
index 8d89220c32e6..d654f70b8f3e 100644
--- a/gnome-base/gnome-menus/ChangeLog
+++ b/gnome-base/gnome-menus/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for gnome-base/gnome-menus
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v 1.175 2012/02/10 02:40:43 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v 1.176 2012/02/29 06:05:54 tetromino Exp $
+
+ 29 Feb 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+ gnome-menus-3.0.1-r1.ebuild:
+ Add missing gnome-common dependency (bug #406231, thanks to Robin Bankhead
+ for reporting). Add introspection.m4 for eautoreconf. Update to EAPI4.
10 Feb 2012; Patrick Lauer <patrick@gentoo.org> gnome-menus-2.30.5.ebuild,
gnome-menus-3.0.1-r1.ebuild, gnome-menus-3.2.0.1-r1.ebuild,
diff --git a/gnome-base/gnome-menus/gnome-menus-3.0.1-r1.ebuild b/gnome-base/gnome-menus/gnome-menus-3.0.1-r1.ebuild
index 8e9748c361d0..112714ab1aa5 100644
--- a/gnome-base/gnome-menus/gnome-menus-3.0.1-r1.ebuild
+++ b/gnome-base/gnome-menus/gnome-menus-3.0.1-r1.ebuild
@@ -1,19 +1,21 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/gnome-menus-3.0.1-r1.ebuild,v 1.3 2012/02/10 02:40:43 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/gnome-menus-3.0.1-r1.ebuild,v 1.4 2012/02/29 06:05:55 tetromino Exp $
-EAPI="3"
+EAPI="4"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
+GNOME_TARBALL_SUFFIX="bz2"
PYTHON_DEPEND="python? 2:2.5"
SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
+RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
inherit autotools eutils gnome2 python
DESCRIPTION="The GNOME menu system, implementing the F.D.O cross-desktop spec"
HOMEPAGE="http://www.gnome.org"
+SRC_URI="${SRC_URI} mirror://gentoo/introspection.m4.bz2"
LICENSE="GPL-2 LGPL-2"
SLOT="0"
@@ -26,7 +28,10 @@ RDEPEND=">=dev-libs/glib-2.18
DEPEND="${RDEPEND}
sys-devel/gettext
>=dev-util/pkgconfig-0.9
- >=dev-util/intltool-0.40"
+ >=dev-util/intltool-0.40
+
+ gnome-base/gnome-common"
+# eautoreconf requires gnome-common
# The actual menus are provided by slot 3
PDEPEND="gnome-base/gnome-menus:3"
@@ -43,16 +48,20 @@ pkg_setup() {
--disable-static
$(use_enable python)
$(use_enable introspection)"
+
+ python_pkg_setup
}
src_prepare() {
# Only build the library (everything else is coming from slot 3)
epatch "${FILESDIR}/${PN}-3.0.2-library-only.patch"
+ # introspection.m4 needed for eautoreconf
+ mv "${WORKDIR}/introspection.m4" m4/ || die
eautoreconf
gnome2_src_prepare
# disable pyc compiling
- echo '#!/bin/sh' > py-compile
+ python_clean_py-compile_files
python_copy_sources
}