summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-04-30 19:17:06 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-04-30 19:17:06 +0000
commit7e3538aadb40441ef4fc6eece2b8194a381c120e (patch)
tree1681a0b57a9669795435a62fdb2c529e4c4c0baf /dev-libs/glib
parentMask USE="fam" for dev-libs/glib because we prefer native CONFIG_INOTIFY_USER... (diff)
downloadhistorical-7e3538aadb40441ef4fc6eece2b8194a381c120e.tar.gz
historical-7e3538aadb40441ef4fc6eece2b8194a381c120e.tar.bz2
historical-7e3538aadb40441ef4fc6eece2b8194a381c120e.zip
Check for CONFIG_INOTIFY_USER wrt #413403
Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64
Diffstat (limited to 'dev-libs/glib')
-rw-r--r--dev-libs/glib/ChangeLog5
-rw-r--r--dev-libs/glib/Manifest16
-rw-r--r--dev-libs/glib/glib-2.32.1.ebuild11
3 files changed, 22 insertions, 10 deletions
diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index 51def4ade8a6..870170bef124 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-libs/glib
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.519 2012/04/29 15:23:06 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.520 2012/04/30 19:17:06 ssuominen Exp $
+
+ 30 Apr 2012; Samuli Suominen <ssuominen@gentoo.org> glib-2.32.1.ebuild:
+ Check for CONFIG_INOTIFY_USER wrt #413403
29 Apr 2012; Markus Meier <maekke@gentoo.org> glib-2.30.3.ebuild:
x86 stable, bug #410611
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 3ad538a860bd..5334385a6c2a 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -37,13 +37,17 @@ EBUILD glib-2.30.2-r1.ebuild 8849 RMD160 8b5bfc01031158cffec83bdaa53fce01d8ebb7f
EBUILD glib-2.30.2.ebuild 8733 RMD160 7a79c7845ff1cb49cff4fdb291e883988ac73a00 SHA1 1fbe14b56672d98da714ed8b639666e4ab071d77 SHA256 09d52abef697d6eaff86fb3546cf3f0a6385c72b76ce5a78a58338be59e17e5d
EBUILD glib-2.30.3.ebuild 8952 RMD160 e98d5a0c88ec60ce748ee184f8b242af4e920d0c SHA1 b22e1efbbf2a19f4d9c936d372d0fe26c172fe9b SHA256 be264519dc0673cae4e4d979e140f807e84dce21fd8cb52b5ccc6fef2edfae05
EBUILD glib-2.32.0.ebuild 8280 RMD160 f4c1b3df7a910cfb4df0e68a6f9846626db5910a SHA1 d8784660a2427b9e2fc5a276dcc83a7ba39534d3 SHA256 7dbcbfc111cb24574528a9f36569c274182429eca4815499035e9381c9c4fea2
-EBUILD glib-2.32.1.ebuild 8574 RMD160 7cb68bd30e04b66c938175489cb58ef946e1f297 SHA1 90c25ef00df1c9a28ee522c3e20522cfada0effb SHA256 9fe46b00c44bb8e016ba27fba82795333c36b0f27d66feb87afa58f29c8a7f5c
-MISC ChangeLog 70125 RMD160 8770fe197c8f6e4adcdd0f536d545981f5ea4b88 SHA1 889a7e154d2451a7c7030eb2e5bc621af7670761 SHA256 1b4befb1ca01b70251be8a2815b8386077bfdaaea22460f50fa08cf8a8ee1962
+EBUILD glib-2.32.1.ebuild 8686 RMD160 914254db040b964e031e017bb22221ceb91e9f09 SHA1 c49acebc6f5238acb9db8e20023b7e3234e8e713 SHA256 c329dad7065118280d807864b50b2c26b299f3c5de1f88469aeccd7a61a9c4c9
+MISC ChangeLog 70247 RMD160 b338b14a7643248e53892a3f11b6e75c8eac0495 SHA1 288430d150da60d09f8bc6adb68774df4a5bbbef SHA256 001027d86bb4d4e15be9ac0aff50f80d2f65716c8b431a8fa491d9c196084345
MISC metadata.xml 497 RMD160 447ae0d07ac529dbe1830e383d2ef4eae7359ea7 SHA1 4cb36fafa32d53a0dbeec978b0d75f4e7acb3fa0 SHA256 a1840f7e6af57edc9fe5b54deae9e2083858d27792fda3f4e1e8e04624b17d0d
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEARECAAYFAk+dXZEACgkQkKaRLQcq0GIHzwCeMIeNiF1uDl9li5LuSUQijOeT
-I74AnRv4JqR37FpAri6eMOXWcZbAgsQA
-=+B95
+iQEcBAEBAgAGBQJPnuS0AAoJEEdUh39IaPFNLgkH/jtiBSGlf/yfGRS20CohNzam
+UW83r/QaJOYUVTihSXbnzjA4cB6KEyZ3gQsXNRKwB5mv9wVC953+iwT6ak/CHm9s
+/uQkMmoRf+1Hi2glT88rL+qpSc8VIMqzSBAJiROCUfuZP7tQuDVSiSldlnzWlrKl
+gOh55wLVwWO+cMBIjDxCfTXz/Vm4fBVQL6Bj5TF68aogGULlfWmy70VVXv3EMhMi
+XzM+IR5JHn/r1qr1Ox2686L0ucEcQ6uaPFciefr2SNH3z3Fit7mnnhJ+1AvN7SyB
+K2awxK2Ldlky9RoRyiFhBN/h49nAadYCMSkV0KVi1Brx8iBwNzjtrE/YUWsGiUQ=
+=3kMC
-----END PGP SIGNATURE-----
diff --git a/dev-libs/glib/glib-2.32.1.ebuild b/dev-libs/glib/glib-2.32.1.ebuild
index 8b1b5fe282cc..9e9b1544b779 100644
--- a/dev-libs/glib/glib-2.32.1.ebuild
+++ b/dev-libs/glib/glib-2.32.1.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.32.1.ebuild,v 1.6 2012/04/26 14:14:32 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.32.1.ebuild,v 1.7 2012/04/30 19:17:06 ssuominen Exp $
EAPI="4"
PYTHON_DEPEND="utils? 2"
# Avoid runtime dependency on python when USE=test
-inherit autotools gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python virtualx
+inherit autotools gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python virtualx linux-info
DESCRIPTION="The GLib library of C routines"
HOMEPAGE="http://www.gtk.org/"
@@ -15,7 +15,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2"
SLOT="2"
-IUSE="debug doc fam selinux static-libs systemtap test utils xattr"
+IUSE="debug doc fam kernel_linux selinux static-libs systemtap test utils xattr"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
RDEPEND="virtual/libiconv
@@ -53,6 +53,11 @@ pkg_setup() {
python_set_active_version 2
python_pkg_setup
fi
+
+ if use kernel_linux ; then
+ CONFIG_CHECK="~INOTIFY_USER"
+ linux-info_pkg_setup
+ fi
}
src_prepare() {