summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2010-12-07 18:03:17 +0000
committerGilles Dartiguelongue <eva@gentoo.org>2010-12-07 18:03:17 +0000
commit9c074e3f3319a7787d4324dfdae0def320d7ee42 (patch)
treefa008a76a9b0b86386c184698a984214787a4fa3
parentStable for PPC (bug #348003). (diff)
downloadhistorical-9c074e3f3319a7787d4324dfdae0def320d7ee42.tar.gz
historical-9c074e3f3319a7787d4324dfdae0def320d7ee42.tar.bz2
historical-9c074e3f3319a7787d4324dfdae0def320d7ee42.zip
Clean up old revisions.
Package-Manager: portage-2.2.0_alpha7/cvs/Linux x86_64
-rw-r--r--dev-libs/glib/ChangeLog8
-rw-r--r--dev-libs/glib/Manifest15
-rw-r--r--dev-libs/glib/files/glib-2.6.3-testglib-ssp.patch11
-rw-r--r--dev-libs/glib/files/glib2-CVE-2008-4316.patch62
-rw-r--r--dev-libs/glib/files/glib2-CVE-2009-3289.patch103
-rw-r--r--dev-libs/glib/glib-2.20.5-r1.ebuild91
-rw-r--r--dev-libs/glib/glib-2.22.4.ebuild92
7 files changed, 11 insertions, 371 deletions
diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index 7bbabe14b305..ad66de816330 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,12 @@
# 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.431 2010/12/04 20:11:36 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.432 2010/12/07 18:03:17 eva Exp $
+
+ 07 Dec 2010; Gilles Dartiguelongue <eva@gentoo.org>
+ -files/glib-2.6.3-testglib-ssp.patch, -glib-2.20.5-r1.ebuild,
+ -glib-2.22.4.ebuild, -files/glib2-CVE-2008-4316.patch,
+ -files/glib2-CVE-2009-3289.patch:
+ Clean up old revisions.
*glib-2.26.1 (04 Dec 2010)
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 67ac8977a976..28e663b5b092 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -17,32 +17,25 @@ AUX glib-2.26.0-disable-volumemonitor-broken-test.patch 1181 RMD160 c99e2969a3ca
AUX glib-2.26.0-error-pileup.patch 1170 RMD160 55767c486b1d95e1d010c4c4b708bade1ef2e541 SHA1 3b0e9cf933e3ec05d85ca537b7f8402aaa864975 SHA256 0d94472348fb664452f56b02501f281c6325f24ae1011f491e4768199abd3054
AUX glib-2.26.0-not-close.patch 900 RMD160 b7f6eb58b78cfef6e4ae41877d4b94da85c45613 SHA1 a9cc2793885de9483094f67e569426d82ac7a77f SHA256 a2a19fd6a2d61bce9f4804a672e9e327dc987886e04a59d504be26cd756fb130
AUX glib-2.26.0-unref-null.patch 828 RMD160 5d08c1f3d76f0b8694dd17db765f85b94be81119 SHA1 e5aa2901a148318cb3ce7f6ed7b79144c9ada7af SHA256 ed3999e11e87ec2ff4b82c24710b9c5db900ad3e2159405c731b825ea4dbbfa4
-AUX glib-2.6.3-testglib-ssp.patch 344 RMD160 6709acf85c52e39553e2e5ee93637f7e9cc7eca6 SHA1 403b249a460a9700669e754a562fb6974f3d6898 SHA256 c2ece3d7b4533e3bfbe8100df5d0824176d9dfa0b18697a8919162956c8ebfa8
-AUX glib2-CVE-2008-4316.patch 2692 RMD160 3143c4df4f1063f8177a545d8cb5678a68c2980f SHA1 f89222a8f09e4e841480bbfbd4defd1e3d402e91 SHA256 c249ef6513c2490e9efe836e9d41a4a5f1056979748e2535b8ec7d13a71b1bf0
-AUX glib2-CVE-2009-3289.patch 3658 RMD160 659328e525ea1c1d0828c9776dfd865b73c1b9c5 SHA1 bf0c5cb7afc89dee5bb7d13041e99bb68e617eaf SHA256 baf5a6739c2cae4c9b50d1f70e08f4c7cfcebf9b82bca5e42cc8454321fdc812
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.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
DIST glib-2.24.2.tar.bz2 5326328 RMD160 259d2d0a92b1a01bb624a2b759d0f82eefc227ea SHA1 882350c31af929cd4e78ee6aad46108748240e78 SHA256 3aeb521abd3642dd1224379f0e54915957e5010f888a4ae74afa0ad54da0160c
DIST glib-2.26.0.tar.bz2 6632632 RMD160 176441944f24c274398903ae1816eecfe2cff36b SHA1 9d7e9dce2add3fadc35079ad291a94f45ebcf706 SHA256 4c18e3aadb5b20acc7c0f7d3a77da8a2843b85a9fd73fd3aa360a7aea953e3b2
DIST glib-2.26.1.tar.bz2 6704686 RMD160 e8b00fce55aa539ee00588500c0162a8877dc060 SHA1 8d35d5cf41d681dd6480a16be39f7d3cffbd29f0 SHA256 7a74ff12b6b9dee1f2d0e520b56b68b621920c4f4250bdf23468e515625c28d5
EBUILD glib-1.2.10-r5.ebuild 1764 RMD160 dc6544841f2acb73d5951100ce9c9182f4d9560e SHA1 e6649f70934720527f69995ab0b8c845032cfb0f SHA256 24442b44089e15432a4f1411d2d59dff9d5c2fbfb91c801b96087588ff71373b
-EBUILD glib-2.20.5-r1.ebuild 2629 RMD160 463ad015124d8dd7385a78b2448dc2508825878a SHA1 6271695a9137c2d48a0528f059f4b307593f9b2a SHA256 30b08ebd051f72739ceb475a6163fa466bb663ddc7222782f28d7925aae5df5f
-EBUILD glib-2.22.4.ebuild 2732 RMD160 b79dfe5bb2b5cb9b3c7ecb9ccf46ab450aa87bc3 SHA1 13496a9a0f26f10173f433fb5843a1a9f6eb01f1 SHA256 b7ab7a260d974d1fcfb58a47055b3cc8f826a5a547ea6e8d663ca8e36619a00f
EBUILD glib-2.22.5.ebuild 2732 RMD160 212f9e2c93dd48dea140d7f508ce945f7b8e8c6f SHA1 f4f14c0eef4d227469e6e958226d38667adc5fbe SHA256 6c3b9b2429665e3c056495a80959ab66a8d3bcd2112c74ef61331552252430d1
EBUILD glib-2.24.1-r1.ebuild 3448 RMD160 16b18a9d5683e9ed87b1a43ba1d2b5421cdfbad6 SHA1 7c6df67e8cdb52bbde58bf46124ece854776faaa SHA256 f3b35203c7407b5bea3502a00018544a430f5e729569ff0b195010b47114e515
EBUILD glib-2.24.2.ebuild 3706 RMD160 4f71057ef43982e66e8a9590c79e8a9651ec752a SHA1 c25ed3a3d44fa02b0fc6a2868156ec6ed497d5d1 SHA256 304a70b13887da7d33a187afd1156d2222cdf3490a0a81420d93d1d6423e5e9b
EBUILD glib-2.26.0-r1.ebuild 4985 RMD160 ae9e8e0da7d854ceefbe45767473bbb5d892a390 SHA1 8c18e803987da081a48f763ca2d6e5604a9c0b76 SHA256 774508b7696f0a7fa9a8c087ebc561e01c58f0eb412c64d8d90b5021eee8ab75
EBUILD glib-2.26.1.ebuild 4877 RMD160 98c3104fc6f2f7b6d78e40ed0261e23075919fc1 SHA1 91502e19a6440d8e4c053d51cf7d6aa0b785b8fa SHA256 0c6e8fb848d18284087259d6fc817df7a8abd37978ca61d790a8faeb13e746a4
-MISC ChangeLog 54430 RMD160 f113f22d0e7fa58e339a71246aac9e4940718d98 SHA1 efc6b0a5bd6aca12bd62f92a7d8beef02c9c247c SHA256 b7fc69594354ebc698c1ece7bf82fc47390a41a669363bf1365041da2c1e8cde
+MISC ChangeLog 54666 RMD160 8db730aa787b5020b66bfa4db3cbc5b851a6dec1 SHA1 ae3d85df85154964a12e0f8af64dc1904cc091e3 SHA256 b2d74887d74a540d94c92f4d07327a427088cd646a40fcae937b9b80ac886152
MISC metadata.xml 285 RMD160 829826c3a3edd13d82bf87a4e6c1c08719f1549f SHA1 03e8b2cfc1956cfea91e8cedfa2451e68b2bf8e5 SHA256 8400998fc578bc9661b57a27ed3226941e4f75ef5bf7d9f929ed9de2d97ba8b0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.16 (GNU/Linux)
-iEYEARECAAYFAkz6oH8ACgkQCaWpQKGI+9RccwCdGnUV9w3TPn+Lr8AHuVM2JW0y
-3F8An25ZLHAsa3i3x7cmqPcJR8FVYwPI
-=j1s2
+iEYEARECAAYFAkz+dvAACgkQ1fmVwcYIWAb3SQCgsmOPmuuQdGJWUYr1AiUFIAzk
+JE8AoKuKI9bTR82rtwDO/RwUGagBu8M2
+=VbE1
-----END PGP SIGNATURE-----
diff --git a/dev-libs/glib/files/glib-2.6.3-testglib-ssp.patch b/dev-libs/glib/files/glib-2.6.3-testglib-ssp.patch
deleted file mode 100644
index 9b104dd570ef..000000000000
--- a/dev-libs/glib/files/glib-2.6.3-testglib-ssp.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tests/Makefile.in.orig 2005-04-07 01:05:39.000000000 +0000
-+++ tests/Makefile.in 2005-04-07 01:09:02.000000000 +0000
-@@ -50,7 +50,7 @@
- CATOBJEXT = @CATOBJEXT@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -fno-stack-protector
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@
diff --git a/dev-libs/glib/files/glib2-CVE-2008-4316.patch b/dev-libs/glib/files/glib2-CVE-2008-4316.patch
deleted file mode 100644
index 758a01b2b966..000000000000
--- a/dev-libs/glib/files/glib2-CVE-2008-4316.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- glib/gbase64.c.orig 2008-12-04 12:07:21.000000000 +0100
-+++ glib/gbase64.c 2009-01-12 14:08:31.000000000 +0100
-@@ -54,8 +54,9 @@ static const char base64_alphabet[] =
- *
- * The output buffer must be large enough to fit all the data that will
- * be written to it. Due to the way base64 encodes you will need
-- * at least: @len * 4 / 3 + 6 bytes. If you enable line-breaking you will
-- * need at least: @len * 4 / 3 + @len * 4 / (3 * 72) + 7 bytes.
-+ * at least: (@len / 3 + 1) * 4 + 4 bytes (+ 4 may be needed in case of
-+ * non-zero state). If you enable line-breaking you will need at least:
-+ * ((@len / 3 + 1) * 4 + 4) / 72 + 1 bytes of extra space.
- *
- * @break_lines is typically used when putting base64-encoded data in emails.
- * It breaks the lines at 72 columns instead of putting all of the text on
-@@ -233,8 +234,14 @@ g_base64_encode (const guchar *data,
- g_return_val_if_fail (data != NULL, NULL);
- g_return_val_if_fail (len > 0, NULL);
-
-- /* We can use a smaller limit here, since we know the saved state is 0 */
-- out = g_malloc (len * 4 / 3 + 4);
-+ /* We can use a smaller limit here, since we know the saved state is 0,
-+ +1 is needed for trailing \0, also check for unlikely integer overflow */
-+ if (len >= ((G_MAXSIZE - 1) / 4 - 1) * 3)
-+ g_error("%s: input too large for Base64 encoding (%"G_GSIZE_FORMAT" chars)",
-+ G_STRLOC, len);
-+
-+ out = g_malloc ((len / 3 + 1) * 4 + 1);
-+
- outlen = g_base64_encode_step (data, len, FALSE, out, &state, &save);
- outlen += g_base64_encode_close (FALSE, out + outlen, &state, &save);
- out[outlen] = '\0';
-@@ -275,7 +282,8 @@ static const unsigned char mime_base64_r
- *
- * The output buffer must be large enough to fit all the data that will
- * be written to it. Since base64 encodes 3 bytes in 4 chars you need
-- * at least: @len * 3 / 4 bytes.
-+ * at least: (@len / 4) * 3 + 3 bytes (+ 3 may be needed in case of non-zero
-+ * state).
- *
- * Return value: The number of bytes of output that was written
- *
-@@ -358,7 +366,8 @@ g_base64_decode (const gchar *text,
- gsize *out_len)
- {
- guchar *ret;
-- gint input_length, state = 0;
-+ gsize input_length;
-+ gint state = 0;
- guint save = 0;
-
- g_return_val_if_fail (text != NULL, NULL);
-@@ -368,7 +377,9 @@ g_base64_decode (const gchar *text,
-
- g_return_val_if_fail (input_length > 1, NULL);
-
-- ret = g_malloc0 (input_length * 3 / 4);
-+ /* We can use a smaller limit here, since we know the saved state is 0,
-+ +1 used to avoid calling g_malloc0(0), and hence retruning NULL */
-+ ret = g_malloc0 ((input_length / 4) * 3 + 1);
-
- *out_len = g_base64_decode_step (text, input_length, ret, &state, &save);
-
diff --git a/dev-libs/glib/files/glib2-CVE-2009-3289.patch b/dev-libs/glib/files/glib2-CVE-2009-3289.patch
deleted file mode 100644
index 4adf30961d99..000000000000
--- a/dev-libs/glib/files/glib2-CVE-2009-3289.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-Patch for bug 286102 from upstream git. It includes the following 5 commits:
-
-commit 3826963e65d8c4c68bcd3e4066505f63ef734b95
-Author: Benjamin Otte <otte@gnome.org>
-Date: Tue Sep 1 21:53:35 2009 +0200
-
-commit 48e0af0157f52ac12b904bd92540432a18b139c7
-Author: Benjamin Otte <otte@gnome.org>
-Date: Tue Sep 1 21:26:08 2009 +0200
-
-commit bb7852e34b1845e516290e1b45a960a345ee8a43
-Author: Benjamin Otte <otte@gnome.org>
-Date: Tue Sep 1 20:36:31 2009 +0200
-
-commit fc44bf40a4eff8e122b223e97ee5efcbc548be03
-Author: Benjamin Otte <otte@gnome.org>
-Date: Tue Sep 1 12:48:55 2009 +0200
-
-commit e695c0932f5d02f3b222f0b7a3de1f8c00ba7b81
-Author: Benjamin Otte <otte@gnome.org>
-Date: Tue Sep 1 11:54:48 2009 +0200
-
-Patch generated by a3li@gentoo.org,
-CVE available for 2.20.5 only (see timeline).
-
-diff --git a/configure.in b/configure.in
-index 7bda924..e2a33b5 100644
---- a/configure.in
-+++ b/configure.in
-@@ -952,7 +952,7 @@ AC_MSG_RESULT(unsigned $glib_size_type)
-
- # Check for some functions
- AC_CHECK_FUNCS(lstat strerror strsignal memmove vsnprintf stpcpy strcasecmp strncasecmp poll getcwd vasprintf setenv unsetenv getc_unlocked readlink symlink fdwalk)
--AC_CHECK_FUNCS(chown lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid)
-+AC_CHECK_FUNCS(chown lchmod lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid)
- AC_CHECK_FUNCS(getmntent_r setmntent endmntent hasmntopt getmntinfo)
- # Check for high-resolution sleep functions
- AC_CHECK_FUNCS(nanosleep nsleep)
-diff --git a/gio/glocalfileinfo.c b/gio/glocalfileinfo.c
-index 72a59b5..a61cc55 100644
---- a/gio/glocalfileinfo.c
-+++ b/gio/glocalfileinfo.c
-@@ -1869,15 +1869,40 @@ get_string (const GFileAttributeValue *value,
-
- static gboolean
- set_unix_mode (char *filename,
-+ GFileQueryInfoFlags flags,
- const GFileAttributeValue *value,
- GError **error)
- {
- guint32 val;
-+ int res = 0;
-
- if (!get_uint32 (value, &val, error))
- return FALSE;
--
-- if (g_chmod (filename, val) == -1)
-+
-+#ifdef HAVE_SYMLINK
-+ if (flags & G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS) {
-+#ifdef HAVE_LCHMOD
-+ res = lchmod (filename, val);
-+#else
-+ struct stat statbuf;
-+ /* Calling chmod on a symlink changes permissions on the symlink.
-+ * We don't want to do this, so we need to check for a symlink */
-+ res = g_lstat (filename, &statbuf);
-+ if (res == 0 && S_ISLNK (statbuf.st_mode))
-+ {
-+ g_set_error_literal (error, G_IO_ERROR,
-+ G_IO_ERROR_NOT_SUPPORTED,
-+ _("Cannot set permissions on symlinks"));
-+ return FALSE;
-+ }
-+ else if (res == 0)
-+ res = g_chmod (filename, val);
-+#endif
-+ } else
-+#endif
-+ res = g_chmod (filename, val);
-+
-+ if (res == -1)
- {
- int errsv = errno;
-
-@@ -2172,7 +2197,7 @@ _g_local_file_info_set_attribute (char *filename,
- _g_file_attribute_value_set_from_pointer (&value, type, value_p, FALSE);
-
- if (strcmp (attribute, G_FILE_ATTRIBUTE_UNIX_MODE) == 0)
-- return set_unix_mode (filename, &value, error);
-+ return set_unix_mode (filename, flags, &value, error);
-
- #ifdef HAVE_CHOWN
- else if (strcmp (attribute, G_FILE_ATTRIBUTE_UNIX_UID) == 0)
-@@ -2316,7 +2341,7 @@ _g_local_file_info_set_attributes (char *filename,
- value = _g_file_info_get_attribute_value (info, G_FILE_ATTRIBUTE_UNIX_MODE);
- if (value)
- {
-- if (!set_unix_mode (filename, value, error))
-+ if (!set_unix_mode (filename, flags, value, error))
- {
- value->status = G_FILE_ATTRIBUTE_STATUS_ERROR_SETTING;
- res = FALSE;
diff --git a/dev-libs/glib/glib-2.20.5-r1.ebuild b/dev-libs/glib/glib-2.20.5-r1.ebuild
deleted file mode 100644
index 23fbf47fa6bc..000000000000
--- a/dev-libs/glib/glib-2.20.5-r1.ebuild
+++ /dev/null
@@ -1,91 +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.20.5-r1.ebuild,v 1.11 2010/09/08 20:41:23 eva Exp $
-
-EAPI="2"
-
-inherit gnome.org eutils flag-o-matic autotools
-
-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 selinux xattr"
-
-RDEPEND="virtual/libiconv
- xattr? ( sys-apps/attr )
- fam? ( virtual/fam )"
-DEPEND="${RDEPEND}
- >=dev-util/pkgconfig-0.16
- >=sys-devel/gettext-0.11
- dev-util/gtk-doc-am
- doc? (
- >=dev-libs/libxslt-1.0
- >=dev-util/gtk-doc-1.11
- ~app-text/docbook-xml-dtd-4.1.2 )"
-
-src_prepare() {
- 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
-
- # Fix bug 286102, symlink permission error (CVE-2009-3289)
- epatch "${FILESDIR}"/${PN}2-CVE-2009-3289.patch
-
- eautoreconf
-}
-
-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
- emake check || die "tests failed"
-}
diff --git a/dev-libs/glib/glib-2.22.4.ebuild b/dev-libs/glib/glib-2.22.4.ebuild
deleted file mode 100644
index d73391c19e29..000000000000
--- a/dev-libs/glib/glib-2.22.4.ebuild
+++ /dev/null
@@ -1,92 +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.4.ebuild,v 1.8 2010/09/08 20:41:23 eva 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 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 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"
-}