From 57f2aa507b537bbb1a818685fdd21825027c6fa0 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Thu, 16 Dec 2010 18:09:21 +0000 Subject: Do not use ED with DESTDIR, mistake #1, see Prefix docs Package-Manager: portage-2.2.01.17390-prefix/cvs/Darwin powerpc --- dev-libs/glib/ChangeLog | 5 ++++- dev-libs/glib/Manifest | 14 ++------------ dev-libs/glib/glib-2.26.1.ebuild | 4 ++-- 3 files changed, 8 insertions(+), 15 deletions(-) (limited to 'dev-libs') diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog index ad66de816330..2a11a5f372fe 100644 --- a/dev-libs/glib/ChangeLog +++ b/dev-libs/glib/ChangeLog @@ -1,6 +1,9 @@ # 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.432 2010/12/07 18:03:17 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.433 2010/12/16 18:09:21 grobian Exp $ + + 16 Dec 2010; Fabian Groffen glib-2.26.1.ebuild: + Do not use ED with DESTDIR 07 Dec 2010; Gilles Dartiguelongue -files/glib-2.6.3-testglib-ssp.patch, -glib-2.20.5-r1.ebuild, diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest index 28e663b5b092..027e9074e1e1 100644 --- a/dev-libs/glib/Manifest +++ b/dev-libs/glib/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX glib-1.2.10-automake.patch 827 RMD160 3b1485f89a157b60f31f5ae8ffe2333ab842d217 SHA1 cd40e4dc579190a89e09fad9ac7b209f24b231b3 SHA256 db6d22caf4054c09467b50b6d85566eec7479a29169460950e423c083332ef67 AUX glib-1.2.10-configure-LANG.patch 1464 RMD160 91481ba6b3f7a1d6e22a4ab7003fcee17450f3c1 SHA1 d98cc2f4ac6cc4aae55270ad0e5705af4de9b3ad SHA256 32377819896297caf9628f382c7bba09ee0a049bd977e9ea927314c0c2e669b4 AUX glib-1.2.10-gcc34-fix.patch 2008 RMD160 7e92b8842a8232cada12453d7f5e5a587a2bf496 SHA1 cb9c6e2f5320590713b3fba61f1d984e569d5d08 SHA256 848620bc200c2a42d726744fe6c36e20a396624e82b0c742b726dd72287e6cdd @@ -29,13 +26,6 @@ EBUILD glib-2.22.5.ebuild 2732 RMD160 212f9e2c93dd48dea140d7f508ce945f7b8e8c6f S 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 54666 RMD160 8db730aa787b5020b66bfa4db3cbc5b851a6dec1 SHA1 ae3d85df85154964a12e0f8af64dc1904cc091e3 SHA256 b2d74887d74a540d94c92f4d07327a427088cd646a40fcae937b9b80ac886152 +EBUILD glib-2.26.1.ebuild 4878 RMD160 5fff60b27b1f486baa0e0c0b303f04f7b764fb62 SHA1 d8d81b59820870a0af99b05204734111f99bbab1 SHA256 347083d3063ccb5aa1acc5d18d7238fc404a3d9a46bdb3135b375cd40ba4d48d +MISC ChangeLog 54771 RMD160 0aae814277c5963b63f2df0b1883fb4eed7e349f SHA1 f30d21446dba0ad1e49708f4a6704271dddc19fb SHA256 f61392d999547a97f194b24cf21b435f4090c44160ab350dc1f75fd4bf3d4c58 MISC metadata.xml 285 RMD160 829826c3a3edd13d82bf87a4e6c1c08719f1549f SHA1 03e8b2cfc1956cfea91e8cedfa2451e68b2bf8e5 SHA256 8400998fc578bc9661b57a27ed3226941e4f75ef5bf7d9f929ed9de2d97ba8b0 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.16 (GNU/Linux) - -iEYEARECAAYFAkz+dvAACgkQ1fmVwcYIWAb3SQCgsmOPmuuQdGJWUYr1AiUFIAzk -JE8AoKuKI9bTR82rtwDO/RwUGagBu8M2 -=VbE1 ------END PGP SIGNATURE----- diff --git a/dev-libs/glib/glib-2.26.1.ebuild b/dev-libs/glib/glib-2.26.1.ebuild index b380d3c501e7..7d2c6f302d7b 100644 --- a/dev-libs/glib/glib-2.26.1.ebuild +++ b/dev-libs/glib/glib-2.26.1.ebuild @@ -1,6 +1,6 @@ # 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.26.1.ebuild,v 1.1 2010/12/04 20:11:36 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.26.1.ebuild,v 1.2 2010/12/16 18:09:21 grobian Exp $ EAPI="3" @@ -107,7 +107,7 @@ src_configure() { src_install() { local f - emake DESTDIR="${ED}" install || die "Installation failed" + emake DESTDIR="${D}" install || die "Installation failed" # Do not install charset.alias even if generated, leave it to libiconv rm -f "${ED}/usr/lib/charset.alias" -- cgit v1.2.3-65-gdbad