diff options
| -rw-r--r-- | dev-libs/glib/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-libs/glib/Manifest | 32 | ||||
| -rw-r--r-- | dev-libs/glib/files/digest-glib-2.4.1 | 1 | ||||
| -rw-r--r-- | dev-libs/glib/files/digest-glib-2.4.2 | 1 | ||||
| -rw-r--r-- | dev-libs/glib/files/digest-glib-2.6.0 | 1 | ||||
| -rw-r--r-- | dev-libs/glib/glib-2.4.1.ebuild | 42 | ||||
| -rw-r--r-- | dev-libs/glib/glib-2.6.0.ebuild (renamed from dev-libs/glib/glib-2.4.2.ebuild) | 24 |
7 files changed, 37 insertions, 71 deletions
diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog index 0f6d819d22cb..d944c5b7c2fe 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.109 2004/12/17 06:57:17 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.110 2004/12/18 17:18:57 foser Exp $ + +*glib-2.6.0 (18 Dec 2004) + + 18 Dec 2004; foser <foser@gentoo.org> glib-2.6.0.ebuild : + New release, add USE static 17 Dec 2004; Mike Frysinger <vapier@gentoo.org> glib-1.2.10-r5.ebuild: Clean up ebuild and dont bother calling elibtoolize anymore (since it doesnt diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest index f4fc1222f2a2..df2be4b13937 100644 --- a/dev-libs/glib/Manifest +++ b/dev-libs/glib/Manifest @@ -1,29 +1,21 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 b5ba05997da3b1ff3017809fd31600c9 ChangeLog 13354 -MD5 2ccc3719f58423601d7575de128d59ad glib-1.2.10-r5.ebuild 1388 -MD5 fd2f66a83b030b479ef059a02996017c glib-2.4.1.ebuild 997 -MD5 33374c66124d4339d26a7241a0fdd6c9 glib-2.4.2.ebuild 1046 MD5 beb86384f4ed20c39b2205fabbb7300c glib-2.4.6.ebuild 1365 -MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 -MD5 ed2973a7556bf32bd2b4509b3eb3ee5b glib-2.4.4.ebuild 1384 +MD5 fd2f66a83b030b479ef059a02996017c glib-2.4.1.ebuild 997 +MD5 8d4de4a4378d413925925a02d48e3d84 glib-2.4.8.ebuild 1374 MD5 7b065119358561f4d6ea80b7713b8683 glib-2.4.5.ebuild 1366 MD5 1df5b9ffd5897a0d710bed320cacff5d glib-2.4.7.ebuild 1374 -MD5 8d4de4a4378d413925925a02d48e3d84 glib-2.4.8.ebuild 1374 -MD5 0b6b97a59b4b0e1acc433697ce022a3c files/digest-glib-1.2.10-r5 63 +MD5 33374c66124d4339d26a7241a0fdd6c9 glib-2.4.2.ebuild 1046 +MD5 ed2973a7556bf32bd2b4509b3eb3ee5b glib-2.4.4.ebuild 1384 +MD5 b5ba05997da3b1ff3017809fd31600c9 ChangeLog 13354 +MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 +MD5 9f52a4886d9143b73eba1a6530e24f57 glib-2.6.0.ebuild 1405 +MD5 2ccc3719f58423601d7575de128d59ad glib-1.2.10-r5.ebuild 1388 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 560ff41071c92560f9de1990dcdde70f files/digest-glib-2.4.6 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 c2049695996219f5b8c81ad1b89f40f0 files/digest-glib-2.4.7 64 MD5 394ed1e8214a881afbed68f0fa2546c9 files/digest-glib-2.4.8 64 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.9.10 (GNU/Linux) - -iD8DBQFBwoNaroRuSHgZdywRAqPIAJ9AO/r/mUInsVS8M+ybnsBbKesM6gCeOeH5 -DBvAVgPOeZqPLxHYh9bMDmY= -=/h0H ------END PGP SIGNATURE----- +MD5 c5265ab52225b51ac7feb1d75bbf4266 files/digest-glib-2.6.0 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.4.1 b/dev-libs/glib/files/digest-glib-2.4.1 deleted file mode 100644 index 290023cddcb9..000000000000 --- a/dev-libs/glib/files/digest-glib-2.4.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 5cbc9249ae27eaf7c0ab4770302f54d8 glib-2.4.1.tar.bz2 2028551 diff --git a/dev-libs/glib/files/digest-glib-2.4.2 b/dev-libs/glib/files/digest-glib-2.4.2 deleted file mode 100644 index 6133e96d61fb..000000000000 --- a/dev-libs/glib/files/digest-glib-2.4.2 +++ /dev/null @@ -1 +0,0 @@ -MD5 038b7cf535cbe016c6bb6033dbcf9acf glib-2.4.2.tar.bz2 2043583 diff --git a/dev-libs/glib/files/digest-glib-2.6.0 b/dev-libs/glib/files/digest-glib-2.6.0 new file mode 100644 index 000000000000..49988c1264aa --- /dev/null +++ b/dev-libs/glib/files/digest-glib-2.6.0 @@ -0,0 +1 @@ +MD5 649b89c8bfd152feea6db6f68b7cd54e glib-2.6.0.tar.bz2 2257529 diff --git a/dev-libs/glib/glib-2.4.1.ebuild b/dev-libs/glib/glib-2.4.1.ebuild deleted file mode 100644 index 933a98763e8f..000000000000 --- a/dev-libs/glib/glib-2.4.1.ebuild +++ /dev/null @@ -1,42 +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.4.1.ebuild,v 1.12 2004/07/28 03:32:36 agriffis Exp $ - -inherit libtool - -DESCRIPTION="The GLib library of C routines" -HOMEPAGE="http://www.gtk.org/" -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" -IUSE="doc" - -DEPEND=">=dev-util/pkgconfig-0.14 - >=sys-devel/gettext-0.11 - doc? ( !s390? ( >=dev-util/gtk-doc-1 ) )" - -RDEPEND="virtual/libc" - -src_compile() { - elibtoolize - - econf \ - --with-threads=posix \ - `use_enable doc gtk-doc` \ - || die - - emake || die -} - -src_install() { - einstall || die - - # 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.4.2.ebuild b/dev-libs/glib/glib-2.6.0.ebuild index ee2eeb2f3863..04ce8661d1bf 100644 --- a/dev-libs/glib/glib-2.4.2.ebuild +++ b/dev-libs/glib/glib-2.6.0.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.2.ebuild,v 1.4 2004/07/02 04:41:59 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.6.0.ebuild,v 1.1 2004/12/18 17:18:57 foser Exp $ inherit libtool @@ -10,21 +10,28 @@ 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" -IUSE="doc" +KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390 ~ppc-macos" +IUSE="doc static" DEPEND=">=dev-util/pkgconfig-0.14 >=sys-devel/gettext-0.11 - doc? ( !s390? ( >=dev-util/gtk-doc-1 ) )" + doc? ( >=dev-util/gtk-doc-1 )" RDEPEND="virtual/libc" src_compile() { - elibtoolize + if use macos; then + glibtoolize + elif use ppc-macos; then + glibtoolize + else + elibtoolize + fi econf \ --with-threads=posix \ + `use_enable static` \ `use_enable doc gtk-doc` \ || die @@ -34,9 +41,14 @@ src_compile() { src_install() { - # einstall || die make DESTDIR=${D} install || die + # Do not install charset.alias for ppc-macos since it already exists. + if (use macos || 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 |