apply static lib fix to 2.10.x as well.

Package-Manager: portage-2.1.2_rc1-r1

4 files changed, 110 insertions, 5 deletions

diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index 4e70f0a27cf1..34a5716a1ad3 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/glib
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.220 2006/11/03 03:01:48 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.221 2006/11/03 03:47:48 allanonjl Exp $
+
+*glib-2.10.3-r1 (03 Nov 2006)
+
+  03 Nov 2006; John N. Laliberte <allanonjl@gentoo.org>
+  +glib-2.10.3-r1.ebuild:
+  apply static lib fix to 2.10.x as well.
 
 *glib-2.12.4-r1 (03 Nov 2006)
 
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 4ebe0ccfbc9f..d429bfd6ef78 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -45,6 +45,10 @@ EBUILD glib-1.2.10-r5.ebuild 1602 RMD160 a45e5b63cf9650771e10b4d788aa35a49b74695
 MD5 0a7b1c38639898440d5eed0f6430a507 glib-1.2.10-r5.ebuild 1602
 RMD160 a45e5b63cf9650771e10b4d788aa35a49b746957 glib-1.2.10-r5.ebuild 1602
 SHA256 0a415f949fc9875f48c0f187117be4de24419d48d9444081e433c5be1a8cbcf8 glib-1.2.10-r5.ebuild 1602
+EBUILD glib-2.10.3-r1.ebuild 2151 RMD160 f9f1afaffafbaecdf4ae77198869cf788269a2a5 SHA1 3defbfaee411aadbde015b8dcd7d5660a4897dce SHA256 003c248d0f1703dbd273de52f70a35f5abf850b02a89febfcc045ee8ba5dee42
+MD5 0aeaf49471c2f71f32aa91d5ef77d2d8 glib-2.10.3-r1.ebuild 2151
+RMD160 f9f1afaffafbaecdf4ae77198869cf788269a2a5 glib-2.10.3-r1.ebuild 2151
+SHA256 003c248d0f1703dbd273de52f70a35f5abf850b02a89febfcc045ee8ba5dee42 glib-2.10.3-r1.ebuild 2151
 EBUILD glib-2.10.3.ebuild 2075 RMD160 cd6750613b5d182232d68ee17e8fd5e82fd66f75 SHA1 a36d424498569e4f86cfc7fbd78e2eb793e4c531 SHA256 22723a1c34350b2bb4051a7a92b2c3f11bfece857926b1f17967a473a0bc14ec
 MD5 ccf04cfbdfadac51d5010dfc3abe29f0 glib-2.10.3.ebuild 2075
 RMD160 cd6750613b5d182232d68ee17e8fd5e82fd66f75 glib-2.10.3.ebuild 2075
@@ -69,10 +73,10 @@ EBUILD glib-2.8.6.ebuild 1608 RMD160 338d8be78856ce5a8ba7d8469c897cb180b8cfa1 SH
 MD5 bf003c8a49124eb8f907181ee83ccf4e glib-2.8.6.ebuild 1608
 RMD160 338d8be78856ce5a8ba7d8469c897cb180b8cfa1 glib-2.8.6.ebuild 1608
 SHA256 f9c35f88a5eb9cb668edf620f234ef87dc55c080733122975068679fac7b6bed glib-2.8.6.ebuild 1608
-MISC ChangeLog 25996 RMD160 71d0411e9629c93430e5ca90e5f3332bab793374 SHA1 ede9bbfd74fd560fcc40c068c82e2de155ebc325 SHA256 f9c9f8625d228dbfde88dcfdfa648f6e605bb176e4f8ed8bd03ea53435112ea4
-MD5 6333a0f93c77e8f1a7f589a74004ffe0 ChangeLog 25996
-RMD160 71d0411e9629c93430e5ca90e5f3332bab793374 ChangeLog 25996
-SHA256 f9c9f8625d228dbfde88dcfdfa648f6e605bb176e4f8ed8bd03ea53435112ea4 ChangeLog 25996
+MISC ChangeLog 26152 RMD160 60121e1713503909aa4d4c17a0f4c1dfc56f89db SHA1 b82176cb7ffb3bfe1e6e5157933fb818aa624603 SHA256 6d1b09a9b612f919f5da843e79b2eafca4cea117f05c6301755f4fdaa8a5b117
+MD5 e510d000e00d487d5dd955d3c4baa442 ChangeLog 26152
+RMD160 60121e1713503909aa4d4c17a0f4c1dfc56f89db ChangeLog 26152
+SHA256 6d1b09a9b612f919f5da843e79b2eafca4cea117f05c6301755f4fdaa8a5b117 ChangeLog 26152
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -83,6 +87,9 @@ SHA256 230915c508b16b95f5b3635e9d1db749edc7ef3f55b9436b66ddf8a3b689851c files/di
 MD5 0df06eb2ed92ba9f4d2c76d5848b9d31 files/digest-glib-2.10.3 241
 RMD160 315111941f64e8af6d32867de75539300af2fd64 files/digest-glib-2.10.3 241
 SHA256 d26cfbb6a042eef4f64ad487901b9f1ac518d1b68ae6d9210dc4c360d296b122 files/digest-glib-2.10.3 241
+MD5 0df06eb2ed92ba9f4d2c76d5848b9d31 files/digest-glib-2.10.3-r1 241
+RMD160 315111941f64e8af6d32867de75539300af2fd64 files/digest-glib-2.10.3-r1 241
+SHA256 d26cfbb6a042eef4f64ad487901b9f1ac518d1b68ae6d9210dc4c360d296b122 files/digest-glib-2.10.3-r1 241
 MD5 a818fa2e2d171393aa71ad8ca6e41c57 files/digest-glib-2.12.4-r1 241
 RMD160 55fd2b02f9b2eb2d2fe2d327082d160804561aa4 files/digest-glib-2.12.4-r1 241
 SHA256 515021fa1093a388a691b5b8da0a6b7af19751778bde6a27be8986f56de93e3d files/digest-glib-2.12.4-r1 241
diff --git a/dev-libs/glib/files/digest-glib-2.10.3-r1 b/dev-libs/glib/files/digest-glib-2.10.3-r1
new file mode 100644
index 000000000000..ecd47e1f877e
--- /dev/null
+++ b/dev-libs/glib/files/digest-glib-2.10.3-r1
@@ -0,0 +1,3 @@
+MD5 87206e721c12d185d17dd9ecd7e30369 glib-2.10.3.tar.bz2 2774011
+RMD160 da56e238f4f6e9c6e7c08d4e53f75128b5178047 glib-2.10.3.tar.bz2 2774011
+SHA256 1d3700e35ca7240a9ce28cf222429648ea50271d62524e008191ccd04a3f8f6f glib-2.10.3.tar.bz2 2774011
diff --git a/dev-libs/glib/glib-2.10.3-r1.ebuild b/dev-libs/glib/glib-2.10.3-r1.ebuild
new file mode 100644
index 000000000000..57ae958407b2
--- /dev/null
+++ b/dev-libs/glib/glib-2.10.3-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.10.3-r1.ebuild,v 1.1 2006/11/03 03:47:48 allanonjl Exp $
+
+inherit gnome.org libtool eutils flag-o-matic debug
+
+DESCRIPTION="The GLib library of C routines"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="debug doc hardened"
+
+RDEPEND="virtual/libc
+	virtual/libiconv"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.14
+	>=sys-devel/gettext-0.11
+	doc?	(
+		>=dev-util/gtk-doc-1.4
+		~app-text/docbook-xml-dtd-4.1.2
+	)"
+
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+
+	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
+
+	epatch ${FILESDIR}/${PN}-2.8.3-macos.patch
+
+}
+
+src_compile() {
+
+	epunt_cxx
+	elibtoolize
+
+	local myconf
+
+	# 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
+	econf \
+		$(use_enable doc gtk-doc) \
+		${myconf} \
+		--with-threads=posix
+		--enable-static || die "configure failed"
+
+	emake || die "make failed"
+
+}
+
+src_install() {
+
+	make DESTDIR="${D}" install || die "Installation failed"
+
+	# Do not install charset.alias even if generated, leave it tol libiconv
+	rm -f ${D}/usr/lib/charset.alias
+
+	# Consider invalid UTF-8 filenames as locale-specific.
+	# TODO :: Eventually get rid of G_BROKEN_FILENAMES
+	dodir /etc/env.d
+	echo "G_BROKEN_FILENAMES=1" > ${D}/etc/env.d/50glib2
+	echo "G_FILENAME_ENCODING=UTF-8" >> ${D}/etc/env.d/50glib2
+
+	dodoc AUTHORS ChangeLog* NEWS* README
+
+}