From: "Pacho Ramos (pacho)" <pacho@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog gnome2.eclass
Date: Sat, 17 Nov 2012 13:03:05 +0000 (UTC) [thread overview]
Message-ID: <20121117130305.DCDCF20C65@flycatcher.gentoo.org> (raw)
pacho 12/11/17 13:03:05
Modified: ChangeLog gnome2.eclass
Log:
Rely on prune_libtool_files for eapis >= 5 as discussed with the team via mail.
Revision Changes Path
1.510 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.510&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.510&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.509&r2=1.510
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.509
retrieving revision 1.510
diff -u -r1.509 -r1.510
--- ChangeLog 17 Nov 2012 10:58:35 -0000 1.509
+++ ChangeLog 17 Nov 2012 13:03:05 -0000 1.510
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.509 2012/11/17 10:58:35 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.510 2012/11/17 13:03:05 pacho Exp $
+
+ 17 Nov 2012; Pacho Ramos <pacho@gentoo.org> gnome2.eclass:
+ Rely on prune_libtool_files for eapis >= 5 as discussed with the team via
+ mail.
17 Nov 2012; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
enlightenment.eclass:
1.111 eclass/gnome2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?rev=1.111&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?rev=1.111&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?r1=1.110&r2=1.111
Index: gnome2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- gnome2.eclass 7 Nov 2012 19:25:35 -0000 1.110
+++ gnome2.eclass 17 Nov 2012 13:03:05 -0000 1.111
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.110 2012/11/07 19:25:35 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.111 2012/11/17 13:03:05 pacho Exp $
# @ECLASS: gnome2.eclass
# @MAINTAINER:
@@ -10,7 +10,7 @@
# Exports portage base functions used by ebuilds written for packages using the
# GNOME framework. For additional functions, see gnome2-utils.eclass.
-inherit fdo-mime libtool gnome.org gnome2-utils
+inherit eutils fdo-mime libtool gnome.org gnome2-utils
case "${EAPI:-0}" in
0|1)
@@ -30,9 +30,13 @@
# @ECLASS-VARIABLE: GNOME2_LA_PUNT
# @DESCRIPTION:
-# Should we delete all the .la files?
+# Should we delete ALL the .la files?
# NOT to be used without due consideration.
-GNOME2_LA_PUNT=${GNOME2_LA_PUNT:-"no"}
+if has ${EAPI:-0} 0 1 2 3 4; then
+ GNOME2_LA_PUNT=${GNOME2_LA_PUNT:-"no"}
+else
+ GNOME2_LA_PUNT=${GNOME2_LA_PUNT:-""}
+fi
# @ECLASS-VARIABLE: ELTCONF
# @DEFAULT-UNSET
@@ -200,12 +204,20 @@
rm -fr "${ED}/usr/share/applications/mimeinfo.cache"
# Delete all .la files
- if [[ "${GNOME2_LA_PUNT}" != "no" ]]; then
- ebegin "Removing .la files"
- if ! { has static-libs ${IUSE//+} && use static-libs; }; then
- find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
+ if has ${EAPI:-0} 0 1 2 3 4; then
+ if [[ "${GNOME2_LA_PUNT}" != "no" ]]; then
+ ebegin "Removing .la files"
+ if ! { has static-libs ${IUSE//+} && use static-libs; }; then
+ find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
+ fi
+ eend
fi
- eend
+ else
+ case "${GNOME2_LA_PUNT}" in
+ yes) prune_libtool_files --modules;;
+ no) ;;
+ *) prune_libtool_files;;
+ esac
fi
}
next reply other threads:[~2012-11-17 13:03 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-17 13:03 Pacho Ramos (pacho) [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-07-09 15:43 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog gnome2.eclass Michal Gorny (mgorny)
2015-04-18 13:19 Pacho Ramos (pacho)
2015-02-23 10:59 Pacho Ramos (pacho)
2015-02-23 10:57 Pacho Ramos (pacho)
2015-01-29 9:59 Pacho Ramos (pacho)
2014-12-16 0:04 Pacho Ramos (pacho)
2014-11-23 19:56 Pacho Ramos (pacho)
2014-02-11 21:14 Pacho Ramos (pacho)
2013-09-29 8:49 Pacho Ramos (pacho)
2013-05-26 14:08 Pacho Ramos (pacho)
2013-01-16 23:01 Gilles Dartiguelongue (eva)
2013-01-13 22:35 Gilles Dartiguelongue (eva)
2012-12-16 14:11 Gilles Dartiguelongue (eva)
2012-12-02 11:07 Pacho Ramos (pacho)
2012-11-27 0:48 Alexandre Rostovtsev (tetromino)
2012-11-26 15:47 Alexandre Rostovtsev (tetromino)
2012-11-24 19:00 Pacho Ramos (pacho)
2012-11-07 19:25 Pacho Ramos (pacho)
2012-11-07 19:17 Pacho Ramos (pacho)
2012-05-09 8:23 Pacho Ramos (pacho)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121117130305.DCDCF20C65@flycatcher.gentoo.org \
--to=pacho@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox