From a2672c5f067f75ec32dfd68b735e16d3c3d816ff Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Sun, 14 Aug 2011 03:08:11 +0000 Subject: [PATCH] Remove .la files only when USE=-static-libs. Previous commit by ssuominen punted .la files unconditionally, bug 379115 Package-Manager: portage-2.2.0_alpha39_p14/cvs/Linux x86_64 --- dev-libs/glib/ChangeLog | 6 +++++- dev-libs/glib/Manifest | 20 +++++++++++++++----- dev-libs/glib/glib-2.28.8.ebuild | 8 +++++--- 3 files changed, 25 insertions(+), 9 deletions(-) diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog index ba032381e52f..01462b2857ae 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.480 2011/08/13 18:44:59 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.481 2011/08/14 03:08:11 nirbheek Exp $ + + 14 Aug 2011; Nirbheek Chauhan glib-2.28.8.ebuild: + Remove .la files only when USE=-static-libs. Previous commit by ssuominen + punted .la files unconditionally, bug 379115 13 Aug 2011; Raúl Porcel glib-2.28.8.ebuild: m68k stable wrt #369909 diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest index 0fb257575574..00eb87a04745 100644 --- a/dev-libs/glib/Manifest +++ b/dev-libs/glib/Manifest @@ -20,13 +20,23 @@ 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 7366 RMD160 157f5856c92b560d3c48466b7c262884b69e7cc4 SHA1 11e290bab9673b6910638e32ef3ca51ea223d63d SHA256 6fa23876a831166a8c2054bba3dc90268ac739ecaf11e34ae580f57781515899 -MISC ChangeLog 62844 RMD160 ad5479eff3274985ff8483de659156a7186c32b7 SHA1 7cde81539e8f29da5b582265ae6bf0fea2709036 SHA256 8109f11618f9f53e0c2613119cf1d6d78848d4f3d58fa32c0a92c2d0e992d4ed +EBUILD glib-2.28.8.ebuild 7408 RMD160 f4eebb014988d39447df798125f55e73c7715e57 SHA1 8ec522a76b4f64233cb627edb70887e2953b75bb SHA256 661321ca48878a77207116191229f643278b3134afdf19e45c9999a93f981e25 +MISC ChangeLog 63043 RMD160 883ec00bcf05c4b446b3dad6b2e3086eedd51a9a SHA1 197de9eff0271bd4711660345762e960fe506ff5 SHA256 a851257c18c9d8e369beb7698b9e81ce3999dc9e314a00f5549109507ac33a36 MISC metadata.xml 285 RMD160 829826c3a3edd13d82bf87a4e6c1c08719f1549f SHA1 03e8b2cfc1956cfea91e8cedfa2451e68b2bf8e5 SHA256 8400998fc578bc9661b57a27ed3226941e4f75ef5bf7d9f929ed9de2d97ba8b0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk5GxjIACgkQuQc30/atMkDg2gCdHIj3vHCNC+KVZm8uRSpRhxEh -0CoAn11i4BC2vZKznn6m7J4p/8KygIjw -=KUdQ +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 -----END PGP SIGNATURE----- diff --git a/dev-libs/glib/glib-2.28.8.ebuild b/dev-libs/glib/glib-2.28.8.ebuild index eceb5f09945d..238da124f462 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.14 2011/08/13 18:44:59 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.28.8.ebuild,v 1.15 2011/08/14 03:08:11 nirbheek Exp $ EAPI="3" GNOME_TARBALL_SUFFIX="xz" @@ -159,8 +159,10 @@ src_install() { done rm -rf "${ED}/etc" - # Redudant with pkg-config files in place - find "${ED}" -name '*.la' -exec rm -f {} + + if ! use static-libs; then + # Redudant with pkg-config files in place + find "${ED}" -name '*.la' -exec rm -f {} + || die + fi } src_test() { -- 2.26.2