Raise gtk-doc requeriment as reported in bug #331407 by Siim Ainsaar, marlon and others. Drop old testing versions.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

5 files changed, 15 insertions, 203 deletions

diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index 4d36ef2f681d..aa3f0036336f 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/glib
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.418 2010/08/18 20:49:28 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.419 2010/08/31 12:58:59 pacho Exp $
+
+  31 Aug 2010; Pacho Ramos <pacho@gentoo.org> -glib-2.22.2.ebuild,
+  -glib-2.24.1.ebuild, glib-2.24.1-r1.ebuild:
+  Raise gtk-doc requeriment as reported in bug #331407 by Siim Ainsaar,
+  marlon and others. Drop old testing versions.
 
   18 Aug 2010; Markus Meier <maekke@gentoo.org> glib-2.22.5.ebuild:
   arm stable, bug #314899
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index b8a98b55a11c..ae504211edfc 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -16,23 +16,20 @@ AUX glib2-CVE-2009-3289.patch 3658 RMD160 659328e525ea1c1d0828c9776dfd865b73c1b9
 DIST glib-1.2.10-r1-as-needed.patch.bz2 9099 RMD160 5b7a21da6dc10112409bd885501a6976a2eb894d SHA1 468a7947b7d1688c2e7d61da80d40ca59422fbec SHA256 3bb8c45706f97b526da851061c89618bc258fa61f9100802c1340548e4bb2731
 DIST glib-1.2.10.tar.gz 421480 RMD160 f19efe8c87ebeea979a4d36902d8a8209640cd95 SHA1 e5a9361c594608d152d5d9650154c2e3260b87fa SHA256 6e1ce7eedae713b11db82f11434d455d8a1379f783a79812cd2e05fc024a8d9f
 DIST glib-2.20.5.tar.bz2 5037738 RMD160 c71ccaaf0a196e21e144041ec3286db18a03a960 SHA1 19e2b2684d7bc35a73ff94eb7fd15fc70cc6f292 SHA256 88f092769df5ce9f784c1068a3055ede00ada503317653984101d5393de63655
-DIST glib-2.22.2.tar.bz2 5490926 RMD160 77227f8feb61c88f9f7fcff586a59ec38114a73d SHA1 bdd9c4b930e81203ea69fe83876cb6c82bdc5a38 SHA256 a4a41d02fc2d3f5effa1fc3466918e0b3ab60e9eb0a08139b997f2649cbacca3
 DIST glib-2.22.4.tar.bz2 5012207 RMD160 66dc6ec0f1b1d422f50f6d55700bee8d526318cc SHA1 be135a25c233a199f043161777d31ac30e42f435 SHA256 0d1f6bf8aaeab772f2370229eefda45bef434e3f29a7d1d8e5dfafeaa1d8ad14
 DIST glib-2.22.5.tar.bz2 4988402 RMD160 2e2f06f956f63a75121b335e4150edc44f5e04f2 SHA1 a35acb06c3155937651aaffc1f1895c6e19a91a4 SHA256 802be9c9ffeb631725ffd6ed35af0af309776729a7fab4fcb48f2b0b8fe7245b
 DIST glib-2.24.1.tar.bz2 5332511 RMD160 c6ce09654c1bd28b8844435d150fcb51e6f4e872 SHA1 d4835bb1618fc1e1dfe88ef8443c12fcae69f90e SHA256 014c3da960bf17117371075c16495f05f36501db990851ceea658f15d2ea6d04
 EBUILD glib-1.2.10-r5.ebuild 1764 RMD160 dc6544841f2acb73d5951100ce9c9182f4d9560e SHA1 e6649f70934720527f69995ab0b8c845032cfb0f SHA256 24442b44089e15432a4f1411d2d59dff9d5c2fbfb91c801b96087588ff71373b
 EBUILD glib-2.20.5-r1.ebuild 2764 RMD160 36b82bded5d46abd6f786ceb40bb9a5ea7a654c9 SHA1 54daa7a36b3dafd74818b3769da523f06e5ed23d SHA256 3714c57070320eb4ba89a13e03f21f3fff281a82423c7609bdfabc77864ee6f1
-EBUILD glib-2.22.2.ebuild 2699 RMD160 e4ae7c825f9547b5628b854da36267aa819e601a SHA1 8adc11d2cd8b9e7faca39ae800cd6d80f438b030 SHA256 6994ab96fe5546effa3b53516434417ce0dcb906f08716bcc403a1bbbd90e8b6
 EBUILD glib-2.22.4.ebuild 2867 RMD160 df24757da42438c1f60b248b768bbc16927bd25c SHA1 459b59f64e9784f23729f7d3ddce36e575f395dd SHA256 b5ff0719930157317dcfa53a93bf2e156c43972712a4799e1b2f4529ea54eccf
 EBUILD glib-2.22.5.ebuild 2867 RMD160 509f8aec204b55e1689a0d75f152f88742b6a2be SHA1 b3029fc61a55c97a97c429dfa4f0387576018659 SHA256 426048c30016ebd837ff7d8eabfd03d946bf36ea45452c51ed78f17704eeb8a1
-EBUILD glib-2.24.1-r1.ebuild 3584 RMD160 828588b3db6b854d1a68c4daea40add1fbabeec0 SHA1 8ec1c91dd2d791dbf0189d71323553e6c6dd1a5a SHA256 7b34e889b01097b6c4affacd30835f8434fffb2a723fb34f2b08916314686fbf
-EBUILD glib-2.24.1.ebuild 2877 RMD160 b4d2ced337826b13cae7816074bb6393e1dd7576 SHA1 ae9040b5d3e698fef8a06e3f5d188ce9c2d3e24f SHA256 78f1f6a15c37bee883af6c7c192defd290f81a344177f8e804a233e553962e03
-MISC ChangeLog 51684 RMD160 02d2c4b3f64a3457c85cd4e29d0fd70682aaa651 SHA1 7eebf4ed1db5ec3fca6e8cdd741b3d4ee248dbc7 SHA256 db60f344f92aa0905281a36874b1f405c255999d7a36ff41f3884c09bff479b8
+EBUILD glib-2.24.1-r1.ebuild 3586 RMD160 2da351a70bc4c090f56b8bad67ffad8f17aa1287 SHA1 5ed64e3deeb03a0652792c85ee65827bd8e3b8bf SHA256 4b796a0b4982b1c6feb1b00b0d549771ce47f003ed8f4e829a94d547d9fdf36c
+MISC ChangeLog 51917 RMD160 75a8db41411216881e04f699a6357fab0554b813 SHA1 61265d9eb15188f62e22d8150fe80da6ff3a3268 SHA256 e913181bcfe6a06e91ba3489af243b843f43a16887c49c4c4cb44e2486b97055
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkxsRvkACgkQkKaRLQcq0GIqjACghH6EdzdUqP2ZIz3guA11oq2c
-tEUAoK7JIdNpy3HjcQCnCxEX0HyFyrU+
-=L60S
+iEYEARECAAYFAkx8/JkACgkQCaWpQKGI+9Qq4ACbBynimvFG5EYr3tbVPvOaCdBw
+sowAn0lXFjy1JOU2/IbFNwTOhZnEOrLv
+=5iKT
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/glib/glib-2.22.2.ebuild b/dev-libs/glib/glib-2.22.2.ebuild
deleted file mode 100644
index ac03208e2282..000000000000
--- a/dev-libs/glib/glib-2.22.2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.22.2.ebuild,v 1.4 2010/01/19 17:17:43 armin76 Exp $
-
-EAPI="2"
-
-inherit gnome.org libtool eutils flag-o-matic
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="debug doc fam hardened selinux xattr"
-
-RDEPEND="virtual/libiconv
-	xattr? ( sys-apps/attr )
-	fam? ( virtual/fam )"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.16
-	>=sys-devel/gettext-0.11
-	doc? (
-		>=dev-libs/libxslt-1.0
-		>=dev-util/gtk-doc-1.11
-		~app-text/docbook-xml-dtd-4.1.2 )"
-
-src_prepare() {
-	if use ppc64 && use hardened ; then
-		replace-flags -O[2-3] -O1
-		epatch "${FILESDIR}/glib-2.6.3-testglib-ssp.patch"
-	fi
-
-	if use ia64 ; then
-		# Only apply for < 4.1
-		local major=$(gcc-major-version)
-		local minor=$(gcc-minor-version)
-		if (( major < 4 || ( major == 4 && minor == 0 ) )); then
-			epatch "${FILESDIR}/glib-2.10.3-ia64-atomic-ops.patch"
-		fi
-	fi
-
-	# Don't fail gio tests when ran without userpriv, upstream bug 552912
-	# This is only a temporary workaround, remove as soon as possible
-	epatch "${FILESDIR}/${PN}-2.18.1-workaround-gio-test-failure-without-userpriv.patch"
-
-	# Fix gmodule issues on fbsd; bug #184301
-	epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
-
-	[[ ${CHOST} == *-freebsd* ]] && elibtoolize
-}
-
-src_configure() {
-	local myconf
-
-	epunt_cxx
-
-	# Building with --disable-debug highly unrecommended.  It will build glib in
-	# an unusable form as it disables some commonly used API.  Please do not
-	# convert this to the use_enable form, as it results in a broken build.
-	# -- compnerd (3/27/06)
-	use debug && myconf="--enable-debug"
-
-	# Always build static libs, see #153807
-	# Always use internal libpcre, bug #254659
-	econf ${myconf}                 \
-		  $(use_enable xattr)       \
-		  $(use_enable doc man)     \
-		  $(use_enable doc gtk-doc) \
-		  $(use_enable fam)         \
-		  $(use_enable selinux)     \
-		  --enable-static           \
-		  --enable-regex            \
-		  --with-pcre=internal      \
-		  --with-threads=posix
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Installation failed"
-
-	# Do not install charset.alias even if generated, leave it to libiconv
-	rm -f "${D}/usr/lib/charset.alias"
-
-	dodoc AUTHORS ChangeLog* NEWS* README || die "dodoc failed"
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	export XDG_CONFIG_DIRS=/etc/xdg
-	export XDG_DATA_DIRS=/usr/local/share:/usr/share
-	export XDG_DATA_HOME="${T}"
-	emake check || die "tests failed"
-}
diff --git a/dev-libs/glib/glib-2.24.1-r1.ebuild b/dev-libs/glib/glib-2.24.1-r1.ebuild
index 1c8974cb664f..972fa6f916c6 100644
--- a/dev-libs/glib/glib-2.24.1-r1.ebuild
+++ b/dev-libs/glib/glib-2.24.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.24.1-r1.ebuild,v 1.6 2010/08/05 16:21:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.24.1-r1.ebuild,v 1.7 2010/08/31 12:58:59 pacho Exp $
 
 EAPI="2"
 
@@ -20,10 +20,10 @@ RDEPEND="virtual/libiconv
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.16
 	>=sys-devel/gettext-0.11
-	>=dev-util/gtk-doc-am-1.11
+	>=dev-util/gtk-doc-am-1.13
 	doc? (
 		>=dev-libs/libxslt-1.0
-		>=dev-util/gtk-doc-1.11
+		>=dev-util/gtk-doc-1.13
 		~app-text/docbook-xml-dtd-4.1.2 )"
 # eautoreconf needs gtk-doc-am
 # XXX: Consider adding test? ( sys-devel/gdb ); assert-msg-test tries to use it
diff --git a/dev-libs/glib/glib-2.24.1.ebuild b/dev-libs/glib/glib-2.24.1.ebuild
deleted file mode 100644
index 54b7b8f1f286..000000000000
--- a/dev-libs/glib/glib-2.24.1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.24.1.ebuild,v 1.1 2010/06/13 15:23:34 pacho Exp $
-
-EAPI="2"
-
-inherit gnome.org libtool eutils flag-o-matic
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="debug doc fam hardened selinux xattr"
-
-RDEPEND="virtual/libiconv
-	xattr? ( sys-apps/attr )
-	fam? ( virtual/fam )"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.16
-	>=sys-devel/gettext-0.11
-	doc? (
-		>=dev-libs/libxslt-1.0
-		>=dev-util/gtk-doc-1.11
-		~app-text/docbook-xml-dtd-4.1.2 )"
-
-src_prepare() {
-	if use ppc64 && use hardened ; then
-		replace-flags -O[2-3] -O1
-		epatch "${FILESDIR}/glib-2.6.3-testglib-ssp.patch"
-	fi
-
-	if use ia64 ; then
-		# Only apply for < 4.1
-		local major=$(gcc-major-version)
-		local minor=$(gcc-minor-version)
-		if (( major < 4 || ( major == 4 && minor == 0 ) )); then
-			epatch "${FILESDIR}/glib-2.10.3-ia64-atomic-ops.patch"
-		fi
-	fi
-
-	# Don't fail gio tests when ran without userpriv, upstream bug 552912
-	# This is only a temporary workaround, remove as soon as possible
-	epatch "${FILESDIR}/${PN}-2.18.1-workaround-gio-test-failure-without-userpriv.patch"
-
-	# Fix gmodule issues on fbsd; bug #184301
-	epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
-
-	# Do not try to remove files on live filesystem, bug #XXX ?
-	sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \
-		-i "${S}"/gio/tests/desktop-app-info.c || die "sed failed"
-
-	[[ ${CHOST} == *-freebsd* ]] && elibtoolize
-}
-
-src_configure() {
-	local myconf
-
-	epunt_cxx
-
-	# Building with --disable-debug highly unrecommended.  It will build glib in
-	# an unusable form as it disables some commonly used API.  Please do not
-	# convert this to the use_enable form, as it results in a broken build.
-	# -- compnerd (3/27/06)
-	use debug && myconf="--enable-debug"
-
-	# Always build static libs, see #153807
-	# Always use internal libpcre, bug #254659
-	econf ${myconf}                 \
-		  $(use_enable xattr)       \
-		  $(use_enable doc man)     \
-		  $(use_enable doc gtk-doc) \
-		  $(use_enable fam)         \
-		  $(use_enable selinux)     \
-		  --enable-static           \
-		  --enable-regex            \
-		  --with-pcre=internal      \
-		  --with-threads=posix
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Installation failed"
-
-	# Do not install charset.alias even if generated, leave it to libiconv
-	rm -f "${D}/usr/lib/charset.alias"
-
-	dodoc AUTHORS ChangeLog* NEWS* README || die "dodoc failed"
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	export XDG_CONFIG_DIRS=/etc/xdg
-	export XDG_DATA_DIRS=/usr/local/share:/usr/share
-	export XDG_DATA_HOME="${T}"
-	emake check || die "tests failed"
-}