new release, mark 2.4.5 x86

8 files changed, 30 insertions, 60 deletions

diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index 6f15513191fa..01f4bbf4ab79 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/glib
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.90 2004/08/08 08:00:31 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.91 2004/08/19 11:43:58 foser Exp $
+
+*glib-2.4.6 (19 Aug 2004)
+
+  19 Aug 2004; foser <foser@gentoo.org> glib-2.4.6.ebuild :
+  New release
 
   08 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> glib-2.4.4.ebuild:
   Stable on alpha.
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 099c709bcc01..a64efb181f00 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,17 +1,19 @@
-MD5 0bee047e315857f22c5c9eeea2bdab1b ChangeLog 11300
-MD5 7c0b7a3aeacf75cf08856b808585d5f6 glib-1.2.10-r5.ebuild 2103
-MD5 81ad1a378e9c801a11af4c6b1501375e glib-2.2.3.ebuild 1021
-MD5 de6e6bd8dd4bac5f1fbaea0e159252e7 glib-2.4.0.ebuild 995
+MD5 bef8159e795830cd14e6f0d69eeb8da5 glib-2.4.6.ebuild 1095
 MD5 fd2f66a83b030b479ef059a02996017c glib-2.4.1.ebuild 997
+MD5 bef8159e795830cd14e6f0d69eeb8da5 glib-2.4.5.ebuild 1095
+MD5 de6e6bd8dd4bac5f1fbaea0e159252e7 glib-2.4.0.ebuild 995
 MD5 33374c66124d4339d26a7241a0fdd6c9 glib-2.4.2.ebuild 1046
+MD5 81ad1a378e9c801a11af4c6b1501375e glib-2.2.3.ebuild 1021
 MD5 c98137212b23233159921c91692be4c0 glib-2.4.4.ebuild 1091
+MD5 0bee047e315857f22c5c9eeea2bdab1b ChangeLog 11300
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 bef8159e795830cd14e6f0d69eeb8da5 glib-2.4.5.ebuild 1095
-MD5 0b6b97a59b4b0e1acc433697ce022a3c files/digest-glib-1.2.10-r5 63
+MD5 7c0b7a3aeacf75cf08856b808585d5f6 glib-1.2.10-r5.ebuild 2103
 MD5 b8ffd1df331b401706a2ac487f28fee8 files/digest-glib-2.2.3 64
 MD5 4d1022292a5ca1a8dc708f7dac746b91 files/digest-glib-2.4.0 64
 MD5 9409a054bd000d556e84987a855b10f0 files/digest-glib-2.4.1 64
 MD5 bb11efe8c19407a4742056f67df25dd7 files/digest-glib-2.4.2 64
 MD5 524c2c1cfb5ab43d0b402cefb8da4a9a files/digest-glib-2.4.4 64
-MD5 2657ca6d0c857b4e97ad93525212ffa1 files/glib-1.2.10-gcc34-fix.patch 2008
 MD5 4f50760a1f3a23a715d8c07ff936bcf6 files/digest-glib-2.4.5 64
+MD5 560ff41071c92560f9de1990dcdde70f files/digest-glib-2.4.6 64
+MD5 2657ca6d0c857b4e97ad93525212ffa1 files/glib-1.2.10-gcc34-fix.patch 2008
+MD5 0b6b97a59b4b0e1acc433697ce022a3c files/digest-glib-1.2.10-r5 63
diff --git a/dev-libs/glib/files/digest-glib-2.2.3 b/dev-libs/glib/files/digest-glib-2.2.3
deleted file mode 100644
index b84f44de8c98..000000000000
--- a/dev-libs/glib/files/digest-glib-2.2.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 aa214a10d873b68ddd67cd9de2ccae55 glib-2.2.3.tar.bz2 1636987
diff --git a/dev-libs/glib/files/digest-glib-2.4.0 b/dev-libs/glib/files/digest-glib-2.4.0
deleted file mode 100644
index 70177ef4995a..000000000000
--- a/dev-libs/glib/files/digest-glib-2.4.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0f5f4896782ec7ab6ea8c7c1d9958114 glib-2.4.0.tar.bz2 2034272
diff --git a/dev-libs/glib/files/digest-glib-2.4.6 b/dev-libs/glib/files/digest-glib-2.4.6
new file mode 100644
index 000000000000..eb34ea0296aa
--- /dev/null
+++ b/dev-libs/glib/files/digest-glib-2.4.6
@@ -0,0 +1 @@
+MD5 a45db7d82480da431f6cd00ea041a534 glib-2.4.6.tar.bz2 2148445
diff --git a/dev-libs/glib/glib-2.2.3.ebuild b/dev-libs/glib/glib-2.2.3.ebuild
deleted file mode 100644
index 62a51392b7bf..000000000000
--- a/dev-libs/glib/glib-2.2.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.2.3.ebuild,v 1.18 2004/07/02 04:41:59 eradicator Exp $
-
-inherit libtool
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="http://www.gtk.org/"
-SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.2/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="x86 ppc sparc alpha hppa mips amd64 ia64 s390 ppc64"
-IUSE="doc debug"
-
-DEPEND=">=dev-util/pkgconfig-0.14
-	>=sys-devel/gettext-0.11
-	doc? ( !s390? ( >=dev-util/gtk-doc-0.9-r2 ) )"
-
-RDEPEND="virtual/libc"
-
-src_compile() {
-
-	local myconf=""
-	use debug && myconf="${myconf}  --enable-debug=yes"
-
-	econf \
-		`use_enable doc gtk-doc` \
-		--with-threads=posix \
-		${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-	einstall || die
-
-	# Consider invalid UTF-8 filenames as locale-specific.
-	dodir /etc/env.d
-	echo "G_BROKEN_FILENAMES=1" > ${D}/etc/env.d/50glib2
-
-	dodoc AUTHORS ChangeLog README* INSTALL NEWS NEWS.pre-1-3
-}
diff --git a/dev-libs/glib/glib-2.4.5.ebuild b/dev-libs/glib/glib-2.4.5.ebuild
index dcfd9c1fd45d..be8995dcd48e 100644
--- a/dev-libs/glib/glib-2.4.5.ebuild
+++ b/dev-libs/glib/glib-2.4.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.4.5.ebuild,v 1.1 2004/07/31 06:56:27 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.4.5.ebuild,v 1.2 2004/08/19 11:43:59 foser Exp $
 
 inherit libtool
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.4/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="2"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390 ~macos"
+KEYWORDS="x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390 ~macos"
 IUSE="doc"
 
 DEPEND=">=dev-util/pkgconfig-0.14
diff --git a/dev-libs/glib/glib-2.4.0.ebuild b/dev-libs/glib/glib-2.4.6.ebuild
index cb8f9c0ac8a8..7bccf58a1fb9 100644
--- a/dev-libs/glib/glib-2.4.0.ebuild
+++ b/dev-libs/glib/glib-2.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.4.0.ebuild,v 1.12 2004/07/14 14:27:37 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.4.6.ebuild,v 1.1 2004/08/19 11:43:59 foser Exp $
 
 inherit libtool
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.4/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="2"
-KEYWORDS="x86 ppc ~sparc mips ~alpha hppa amd64 ~ia64 ~s390 ~ppc64"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390 ~macos"
 IUSE="doc"
 
 DEPEND=">=dev-util/pkgconfig-0.14
@@ -21,9 +21,14 @@ RDEPEND="virtual/libc"
 
 src_compile() {
 
-	elibtoolize
+	if use macos; then
+		glibtoolize
+	else
+		elibtoolize
+	fi
 
-	econf --with-threads=posix \
+	econf \
+		--with-threads=posix \
 		`use_enable doc gtk-doc` \
 		|| die
 
@@ -33,7 +38,8 @@ src_compile() {
 
 src_install() {
 
-	einstall || die
+	# einstall || die
+	make DESTDIR=${D} install || die
 
 	# Consider invalid UTF-8 filenames as locale-specific.
 	# FIXME : we should probably move to suggesting G_FILENAME_ENC
@@ -41,4 +47,5 @@ src_install() {
 	echo "G_BROKEN_FILENAMES=1" > ${D}/etc/env.d/50glib2
 
 	dodoc AUTHORS ChangeLog* README* INSTALL NEWS*
+
 }