summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2012-12-25 18:17:36 +0000
committerGilles Dartiguelongue <eva@gentoo.org>2012-12-25 18:17:36 +0000
commitf506b7d56766063867bab23c7da7c494b85c454c (patch)
treea5f4f7bae70232867a90ed440ede5f54cfbb0441 /gnome-base/libgnomekbd
parentnon maintainer: fix build bug #433409 (diff)
downloadgentoo-2-f506b7d56766063867bab23c7da7c494b85c454c.tar.gz
gentoo-2-f506b7d56766063867bab23c7da7c494b85c454c.tar.bz2
gentoo-2-f506b7d56766063867bab23c7da7c494b85c454c.zip
Version bump for Gnome 3.6. Switch to EAPI=5. USE=introspection is now global.
(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key C6085806)
Diffstat (limited to 'gnome-base/libgnomekbd')
-rw-r--r--gnome-base/libgnomekbd/ChangeLog9
-rw-r--r--gnome-base/libgnomekbd/libgnomekbd-3.6.0.ebuild (renamed from gnome-base/libgnomekbd/libgnomekbd-3.2.0-r1.ebuild)31
-rw-r--r--gnome-base/libgnomekbd/metadata.xml6
3 files changed, 22 insertions, 24 deletions
diff --git a/gnome-base/libgnomekbd/ChangeLog b/gnome-base/libgnomekbd/ChangeLog
index 3d771a1704a9..5d285ca47242 100644
--- a/gnome-base/libgnomekbd/ChangeLog
+++ b/gnome-base/libgnomekbd/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for gnome-base/libgnomekbd
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/ChangeLog,v 1.101 2012/05/21 18:57:27 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/ChangeLog,v 1.102 2012/12/25 18:17:36 eva Exp $
+
+*libgnomekbd-3.6.0 (25 Dec 2012)
+
+ 25 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org>
+ -libgnomekbd-3.2.0-r1.ebuild, +libgnomekbd-3.6.0.ebuild, metadata.xml:
+ Version bump for Gnome 3.6. Switch to EAPI=5. USE=introspection is now
+ global.
21 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
libgnomekbd-2.32.0-r1.ebuild:
diff --git a/gnome-base/libgnomekbd/libgnomekbd-3.2.0-r1.ebuild b/gnome-base/libgnomekbd/libgnomekbd-3.6.0.ebuild
index 531c01920ff9..a80d666bf7db 100644
--- a/gnome-base/libgnomekbd/libgnomekbd-3.2.0-r1.ebuild
+++ b/gnome-base/libgnomekbd/libgnomekbd-3.6.0.ebuild
@@ -1,42 +1,37 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/libgnomekbd-3.2.0-r1.ebuild,v 1.2 2012/05/05 05:38:10 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/libgnomekbd-3.6.0.ebuild,v 1.1 2012/12/25 18:17:36 eva Exp $
-EAPI="4"
+EAPI="5"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
-inherit eutils gnome2
+inherit gnome2
DESCRIPTION="Gnome keyboard configuration library"
HOMEPAGE="http://www.gnome.org"
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="+introspection test"
-RDEPEND=">=dev-libs/glib-2.18:2
+RDEPEND="
+ >=dev-libs/glib-2.18:2
>=x11-libs/gtk+-2.91.7:3[introspection?]
- >=x11-libs/libxklavier-5.1
+ >=x11-libs/libxklavier-5.2[introspection?]
- introspection? ( >=dev-libs/gobject-introspection-0.6.7 )"
+ introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
+"
DEPEND="${RDEPEND}
>=dev-util/intltool-0.35
- virtual/pkgconfig"
+ virtual/pkgconfig
+"
-pkg_setup() {
+src_configure() {
G2CONF="${G2CONF}
--disable-static
- --disable-schemas-compile
$(use_enable introspection)
$(use_enable test tests)"
- DOCS="AUTHORS ChangeLog NEWS README"
-}
-
-src_prepare() {
- # Upstream patch to use correct GtkTrayIcon:fg-color type; fixes g-s-d crash
- epatch "${FILESDIR}/${P}-fg-color.patch"
-
- gnome2_src_prepare
+ gnome2_src_configure
}
diff --git a/gnome-base/libgnomekbd/metadata.xml b/gnome-base/libgnomekbd/metadata.xml
index 44825d13c084..da6fd63d0085 100644
--- a/gnome-base/libgnomekbd/metadata.xml
+++ b/gnome-base/libgnomekbd/metadata.xml
@@ -1,9 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>gnome</herd>
- <use>
- <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
- for introspection</flag>
- </use>
+<herd>gnome</herd>
</pkgmetadata>