From 3d737ad6c1de2ae926e2b0c89f365c14fb3198ba Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Sun, 14 Aug 2011 09:44:14 +0000 Subject: [PATCH] Revert last libtool file preservation since we have usable pkg-config files wrt #379115. Package-Manager: portage-2.2.0_alpha50/cvs/Linux x86_64 --- dev-libs/glib/ChangeLog | 6 +++++- dev-libs/glib/Manifest | 22 ++++++---------------- dev-libs/glib/glib-2.28.8.ebuild | 9 ++++----- 3 files changed, 15 insertions(+), 22 deletions(-) diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog index 01462b2857ae..2b2cd19ac7e1 100644 --- a/dev-libs/glib/ChangeLog +++ b/dev-libs/glib/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/glib # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.481 2011/08/14 03:08:11 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.482 2011/08/14 09:44:14 ssuominen Exp $ + + 14 Aug 2011; Samuli Suominen glib-2.28.8.ebuild: + Revert last libtool file preservation since we have usable pkg-config files + wrt #379115. 14 Aug 2011; Nirbheek Chauhan glib-2.28.8.ebuild: Remove .la files only when USE=-static-libs. Previous commit by ssuominen diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest index 00eb87a04745..a55d7dc94360 100644 --- a/dev-libs/glib/Manifest +++ b/dev-libs/glib/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 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 @@ -20,23 +20,13 @@ DIST glib-2.28.8.tar.xz 5223564 RMD160 9f665eee95990ace173676a4ad7aeeb0cc17fef9 DIST pkg-config-0.26.tar.gz 396399 RMD160 face3d16ec338b9b1ab41d56d6e4d1a5624b52d0 SHA1 fd71a70b023b9087c8a7bb76a0dc135a61059652 SHA256 94c1936a797c930fb3e4e5a154165b6268caba22b32d24083dd4c492a533c8af EBUILD glib-1.2.10-r5.ebuild 1777 RMD160 eaf01d9d6f1ba55edb93e46f46110b9e9c2fb778 SHA1 dbedf2bc146dcbec47ad308621bf1077c9f735cb SHA256 9d9dd1ea44c25087918148c2ba1203f3b38be09996bd7e48a26f9b4f93405d36 EBUILD glib-2.28.6.ebuild 5649 RMD160 1a57e73c13cae0a708808053ed6bd3e92c1ce29c SHA1 3c607a96e34dad256b32d9b006f2f5a8a333f454 SHA256 4a9d0a6f835a2aced9de540091acf8eaccf74cb054ce6d55576ea2ef34bdb78e -EBUILD glib-2.28.8.ebuild 7408 RMD160 f4eebb014988d39447df798125f55e73c7715e57 SHA1 8ec522a76b4f64233cb627edb70887e2953b75bb SHA256 661321ca48878a77207116191229f643278b3134afdf19e45c9999a93f981e25 -MISC ChangeLog 63043 RMD160 883ec00bcf05c4b446b3dad6b2e3086eedd51a9a SHA1 197de9eff0271bd4711660345762e960fe506ff5 SHA256 a851257c18c9d8e369beb7698b9e81ce3999dc9e314a00f5549109507ac33a36 +EBUILD glib-2.28.8.ebuild 7413 RMD160 88889cf52ea9c7c82ccc8150bd30e2a40cdc5556 SHA1 8e1f4f2df9d337d357353edb35f1431e410fb5e2 SHA256 e30ec2278bdc6a7e9b580b036487f261330806a2b6a5a0413376b92844b3dd78 +MISC ChangeLog 63212 RMD160 7f80761a11a30102d9c8e4931fce22f635acf125 SHA1 c6c1c8f1a30938ec0875aeeb60c8953329c7736e SHA256 eb5857ff40530edec65b5e3910041fb5d3df4e9acc6479718e540f4a835ebf3a MISC metadata.xml 285 RMD160 829826c3a3edd13d82bf87a4e6c1c08719f1549f SHA1 03e8b2cfc1956cfea91e8cedfa2451e68b2bf8e5 SHA256 8400998fc578bc9661b57a27ed3226941e4f75ef5bf7d9f929ed9de2d97ba8b0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQIcBAEBAgAGBQJORzwgAAoJEO/kOhxWD91kwA8P/1SOJGyGe0RpoL1q9hR4DaUO -yOn+MGIvW7XDxH6KlVrp0m5Ont/gQWNdHqs553Dj9tl22Glca8wn/DERdVr1ispF -ftXDupDXTyiMPnHpsqkbQXAqc2+v/vkzpRQU2fa4u2Sy0iqHfCssDp0P7T7KoidE -73osysuv8MbWn9kpkb/oH9/3MLHxrCnb8BT/dvg+rTCMxh6WVkT0R0B269Ch+gy1 -jq1B9mhGmc4K34+JEQz/I3zOJHhajlBpm5vHlPio3FDvHMxoomaR8VjHQVs5en47 -BKFdInx4B+ihSYBjPvX/bzTzJxCFiPnIhSQrk3VWy2ZUwzU6jItyJ8S/4muVq9G/ -N6Lisfp2RgyDtoaZqtaH5NyUuOTHH8VzTZ/J8xYDJr3caVX8uGYaxtdI+ePHdd+H -xUSJEPexV9Z3XkCX+HSjdiU6s92jzwTFb76sGazoamb98sGhdKfPLK6Ua6q8rhrX -SZh4etfzMmsoKuLQY26N475jZ9Hr9gnMSzWjhi9QJtZ8BQKSHIAbvyBQllCslVA6 -gu0iaclGa83KthPVOgT36zKxQzPwOLGXoyWDsrVSDnzMnkts77auaJbOrhsopePy -0Fm7aOBST7w0dG+K5alOXgM7KiYA25UnvhJlwfdUhiH0xoPKwaiknfkFnzmAY/0z -V2Wrm42NcjaAsAeJk1qO -=T5zq +iF4EAREIAAYFAk5HmMsACgkQXkR9YqOcLPGDGgEAo/xN7qH9kyhGmYMLu2YOqSxV +6SevvY3Yi5gg4XaJH20BAIgJrQSeA2Px7xXyfUl976bBEXEVIyvWCXqQPJ48Wrlz +=lEL2 -----END PGP SIGNATURE----- diff --git a/dev-libs/glib/glib-2.28.8.ebuild b/dev-libs/glib/glib-2.28.8.ebuild index 238da124f462..eb1f144a4090 100644 --- a/dev-libs/glib/glib-2.28.8.ebuild +++ b/dev-libs/glib/glib-2.28.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.28.8.ebuild,v 1.15 2011/08/14 03:08:11 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.28.8.ebuild,v 1.16 2011/08/14 09:44:14 ssuominen Exp $ EAPI="3" GNOME_TARBALL_SUFFIX="xz" @@ -159,10 +159,9 @@ src_install() { done rm -rf "${ED}/etc" - if ! use static-libs; then - # Redudant with pkg-config files in place - find "${ED}" -name '*.la' -exec rm -f {} + || die - fi + # Completely useless with or without USE static-libs, people need to use + # pkg-config + find "${ED}" -name '*.la' -exec rm -f {} + } src_test() { -- 2.26.2