New version: 2.8.2. Removing old ebuilds.

(Portage version: 2.0.52-r1)

7 files changed, 24 insertions, 97 deletions

diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index 767135c74a96..0c6d2c1c1bfd 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/glib
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.159 2005/09/17 20:10:57 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.160 2005/09/27 01:45:19 leonardop Exp $
+
+*glib-2.8.2 (27 Sep 2005)
+
+  27 Sep 2005; Leonardo Boshell <leonardop@gentoo.org> -glib-2.6.4.ebuild,
+  -glib-2.8.1.ebuild, +glib-2.8.2.ebuild:
+  New version. Avoid passing --disable-debug.
 
   10 Sep 2005; Aron Griffis <agriffis@gentoo.org> glib-2.6.5.ebuild:
   Mark 2.6.5 stable on alpha
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 7d338c194e8a..67ac5f8e8485 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,24 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 440ba5ceb0b975e941ad71804194eaeb ChangeLog 18443
 MD5 b75614f954c7353c9e75e011ee1adb59 glib-1.2.10-r5.ebuild 1536
-MD5 5bc59f4a174bf905f387fc78ded9e67c glib-2.6.4.ebuild 1632
+MD5 fae07c6bf61e15f9f9d49b49faf629f8 glib-2.8.2.ebuild 1759
+MD5 add184504c58a6f30106d58090ad645a glib-2.8.1.ebuild 1697
+MD5 18f42d10033f2d68a3f4430ba8eb97ea .glib-2.8.2.ebuild.swp 12288
 MD5 e19f2f426fdecf8788d79e0a54c4905a glib-2.6.5.ebuild 1646
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 add184504c58a6f30106d58090ad645a glib-2.8.1.ebuild 1697
-MD5 440ba5ceb0b975e941ad71804194eaeb ChangeLog 18443
 MD5 0b6b97a59b4b0e1acc433697ce022a3c files/digest-glib-1.2.10-r5 63
-MD5 0d475655c887a08ddbfccb827a1f46b5 files/digest-glib-2.6.4 64
-MD5 60c45aba2f0c1b47590e8193b533d7c7 files/digest-glib-2.6.5 64
+MD5 191b2c40165605d5d4507a2bda91b556 files/digest-glib-2.8.2 64
+MD5 b66fda2207583238578ade2bd69e470b files/digest-glib-2.8.1 64
+MD5 7fec226893c96f1126810906e2fb3e5b files/glib-2.6.3-testglib-ssp.patch 344
 MD5 2657ca6d0c857b4e97ad93525212ffa1 files/glib-1.2.10-gcc34-fix.patch 2008
-MD5 6da4b81e0a2656f101965a505c7cb6d4 files/glib-1.2.10-m4.patch 225
 MD5 1a4565b760afb02416ff0d674c89c83f files/glib-2-macos.patch 989
-MD5 7fec226893c96f1126810906e2fb3e5b files/glib-2.6.3-testglib-ssp.patch 344
-MD5 b66fda2207583238578ade2bd69e470b files/digest-glib-2.8.1 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDLHhsKf2g/qXtneoRAtQrAJ4yadhr9SCmhtGI8lV+suMdtFgonwCbBv3T
-WdfhTJ275kNYo6tDoFHXy/U=
-=DU9G
------END PGP SIGNATURE-----
+MD5 6da4b81e0a2656f101965a505c7cb6d4 files/glib-1.2.10-m4.patch 225
+MD5 60c45aba2f0c1b47590e8193b533d7c7 files/digest-glib-2.6.5 64
diff --git a/dev-libs/glib/files/digest-glib-2.6.4 b/dev-libs/glib/files/digest-glib-2.6.4
deleted file mode 100644
index 8c5184476290..000000000000
--- a/dev-libs/glib/files/digest-glib-2.6.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 af7eeb8aae764ff763418471ed6eb93d glib-2.6.4.tar.bz2 2377430
diff --git a/dev-libs/glib/files/digest-glib-2.8.1 b/dev-libs/glib/files/digest-glib-2.8.1
deleted file mode 100644
index 299624242014..000000000000
--- a/dev-libs/glib/files/digest-glib-2.8.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2229ca9d5490a87d5e027e029520df14 glib-2.8.1.tar.bz2 2561938
diff --git a/dev-libs/glib/files/digest-glib-2.8.2 b/dev-libs/glib/files/digest-glib-2.8.2
new file mode 100644
index 000000000000..f164aab5b422
--- /dev/null
+++ b/dev-libs/glib/files/digest-glib-2.8.2
@@ -0,0 +1 @@
+MD5 f5239c04a0b0463df1bdf61ed517b3de glib-2.8.2.tar.bz2 2562143
diff --git a/dev-libs/glib/glib-2.6.4.ebuild b/dev-libs/glib/glib-2.6.4.ebuild
deleted file mode 100644
index 018f85c3c9b3..000000000000
--- a/dev-libs/glib/glib-2.6.4.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.6.4.ebuild,v 1.9 2005/08/10 12:29:08 ka0ttic Exp $
-
-inherit libtool eutils flag-o-matic
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="http://www.gtk.org/"
-SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.6/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ~ppc-macos ppc64 s390 sparc x86"
-IUSE="doc hardened static"
-
-DEPEND=">=dev-util/pkgconfig-0.14
-	>=sys-devel/gettext-0.11
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-RDEPEND="virtual/libc"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	use ppc-macos && epatch ${FILESDIR}/${PN}-2-macos.patch
-
-	if use ppc64 && use hardened; then
-		replace-flags -O[2-3] -O1
-		epatch ${FILESDIR}/glib-2.6.3-testglib-ssp.patch
-	fi
-
-}
-
-src_compile() {
-
-	epunt_cxx
-
-	if use ppc-macos; then
-		glibtoolize
-		append-ldflags "-L/usr/lib -lpthread"
-	fi
-
-	# enable static for PAM
-	econf \
-		--with-threads=posix \
-		`use_enable static` \
-		`use_enable doc gtk-doc` \
-		|| die
-
-	emake || die
-
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die
-
-	# Do not install charset.alias for ppc-macos since it already exists.
-	if use ppc-macos ; then
-		einfo "Not installing charset.alias on macos"
-		rm ${D}/usr/lib/charset.alias || die "Cannot remove charset.alias from the image"
-	fi
-
-	# Consider invalid UTF-8 filenames as locale-specific.
-	# FIXME : we should probably move to suggesting G_FILENAME_ENC
-	dodir /etc/env.d
-	echo "G_BROKEN_FILENAMES=1" > ${D}/etc/env.d/50glib2
-
-	dodoc AUTHORS ChangeLog* README* INSTALL NEWS*
-
-}
diff --git a/dev-libs/glib/glib-2.8.1.ebuild b/dev-libs/glib/glib-2.8.2.ebuild
index 70f3c35529a6..21f1d7ba88ac 100644
--- a/dev-libs/glib/glib-2.8.1.ebuild
+++ b/dev-libs/glib/glib-2.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.8.1.ebuild,v 1.1 2005/08/25 01:16:56 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.8.2.ebuild,v 1.1 2005/09/27 01:45:19 leonardop Exp $
 
 inherit gnome.org libtool eutils flag-o-matic debug
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.gtk.org/"
 LICENSE="LGPL-2"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sparc ~x86"
-IUSE="debug doc hardened static"
+IUSE="debug doc hardened"
 
 DEPEND=">=dev-util/pkgconfig-0.14
 	>=sys-devel/gettext-0.11
@@ -34,8 +34,11 @@ src_unpack() {
 }
 
 src_compile() {
-	local myconf="--with-threads=posix $(use_enable static) \
-		$(use_enable doc gtk-doc) $(use_enable debug)"
+	local myconf="--with-threads=posix \
+		$(use_enable doc gtk-doc)"
+
+	# --disable-debug is not recommended for production use
+	use debug && myconf="${myconf} --enable-debug=yes"
 
 	epunt_cxx