* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog eutils.eclass
@ 2011-12-02 10:22 Brian Harring (ferringb)
0 siblings, 0 replies; 28+ messages in thread
From: Brian Harring (ferringb) @ 2011-12-02 10:22 UTC (permalink / raw
To: gentoo-commits
ferringb 11/12/02 10:22:41
Modified: ChangeLog eutils.eclass
Log:
fix eqawarn to always return 0; this matches portage behaviour which annoyingly, certain high profile ebuilds like freetype rely on via autotools eclass
Revision Changes Path
1.31 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.31&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.31&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.30&r2=1.31
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ChangeLog 27 Nov 2011 09:57:20 -0000 1.30
+++ ChangeLog 2 Dec 2011 10:22:41 -0000 1.31
@@ -1,6 +1,11 @@
# ChangeLog for eclass directory
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.30 2011/11/27 09:57:20 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.31 2011/12/02 10:22:41 ferringb Exp $
+
+ 02 Dec 2011; Brian Harring <ferringb@gentoo.org> eutils.eclass:
+ Fix eqawarn to match portage's return code; this fixes sporadic failures
+ in alternate managers for packages like freetype that bleed the
+ return code through.
27 Nov 2011; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
Revert making pushd/popd fatal due to humongous breakage. Add a warning
1.370 eclass/eutils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.370&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.370&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?r1=1.369&r2=1.370
Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.369
retrieving revision 1.370
diff -u -r1.369 -r1.370
--- eutils.eclass 2 Dec 2011 03:27:37 -0000 1.369
+++ eutils.eclass 2 Dec 2011 10:22:41 -0000 1.370
@@ -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/eclass/eutils.eclass,v 1.369 2011/12/02 03:27:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.370 2011/12/02 10:22:41 ferringb Exp $
# @ECLASS: eutils.eclass
# @MAINTAINER:
@@ -72,6 +72,7 @@
if ! declare -F eqawarn >/dev/null ; then
eqawarn() {
has qa ${PORTAGE_ELOG_CLASSES} && ewarn "$@"
+ :
}
fi
^ permalink raw reply [flat|nested] 28+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog eutils.eclass
@ 2011-12-17 3:57 Maciej Mrozowski (reavertm)
0 siblings, 0 replies; 28+ messages in thread
From: Maciej Mrozowski (reavertm) @ 2011-12-17 3:57 UTC (permalink / raw
To: gentoo-commits
reavertm 11/12/17 03:57:38
Modified: ChangeLog eutils.eclass
Log:
Revert old eshopts_{pop,push} implementations until new ones pass unit tests. Bug 395025.
Revision Changes Path
1.47 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.47&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.47&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.46&r2=1.47
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- ChangeLog 16 Dec 2011 20:02:48 -0000 1.46
+++ ChangeLog 17 Dec 2011 03:57:38 -0000 1.47
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.46 2011/12/16 20:02:48 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.47 2011/12/17 03:57:38 reavertm Exp $
+
+ 17 Dec 2011; Maciej Mrozowski <reavertm@gentoo.org> eutils.eclass:
+ Revert old eshopts_{pop,push} implementations until new ones pass unit tests.
+ Bug 395025.
16 Dec 2011; Jonathan Callen <abcd@gentoo.org> qt4-build.eclass:
Set importdir to be /usr/$(get_libdir)/qt4/imports instead of the
1.374 eclass/eutils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.374&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.374&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?r1=1.373&r2=1.374
Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.373
retrieving revision 1.374
diff -u -r1.373 -r1.374
--- eutils.eclass 16 Dec 2011 23:38:41 -0000 1.373
+++ eutils.eclass 17 Dec 2011 03:57:38 -0000 1.374
@@ -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/eclass/eutils.eclass,v 1.373 2011/12/16 23:38:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.374 2011/12/17 03:57:38 reavertm Exp $
# @ECLASS: eutils.eclass
# @MAINTAINER:
@@ -174,14 +174,15 @@
eshopts_push() {
# have to assume __ESHOPTS_SAVE__ isn't screwed with
# as a `declare -a` here will reset its value
+ local i=${#__ESHOPTS_SAVE__[@]}
if [[ $1 == -[su] ]] ; then
- estack_push eshopts "$(shopt -p)"
+ __ESHOPTS_SAVE__[$i]=$(shopt -p)
[[ $# -eq 0 ]] && return 0
- shopt "$@" || die "${FUNCNAME}: bad options to shopt: $*"
+ shopt "$@" || die "eshopts_push: bad options to shopt: $*"
else
- estack_push eshopts $-
+ __ESHOPTS_SAVE__[$i]=$-
[[ $# -eq 0 ]] && return 0
- set "$@" || die "${FUNCNAME}: bad options to set: $*"
+ set "$@" || die "eshopts_push: bad options to set: $*"
fi
}
@@ -191,13 +192,16 @@
# Restore the shell options to the state saved with the corresponding
# eshopts_push call. See that function for more details.
eshopts_pop() {
- local s
- estack_pop eshopts s || die "${FUNCNAME}: unbalanced push"
+ [[ $# -ne 0 ]] && die "eshopts_pop takes no arguments"
+ local i=$(( ${#__ESHOPTS_SAVE__[@]} - 1 ))
+ [[ ${i} -eq -1 ]] && die "eshopts_{push,pop}: unbalanced pair"
+ local s=${__ESHOPTS_SAVE__[$i]}
+ unset __ESHOPTS_SAVE__[$i]
if [[ ${s} == "shopt -"* ]] ; then
- eval "${s}" || die "${FUNCNAME}: sanity: invalid shopt options: ${s}"
+ eval "${s}" || die "eshopts_pop: sanity: invalid shopt options: ${s}"
else
- set +$- || die "${FUNCNAME}: sanity: invalid shell settings: $-"
- set -${s} || die "${FUNCNAME}: sanity: unable to restore saved shell settings: ${s}"
+ set +$- || die "eshopts_pop: sanity: invalid shell settings: $-"
+ set -${s} || die "eshopts_pop: sanity: unable to restore saved shell settings: ${s}"
fi
}
^ permalink raw reply [flat|nested] 28+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog eutils.eclass
@ 2012-02-26 13:20 Pacho Ramos (pacho)
0 siblings, 0 replies; 28+ messages in thread
From: Pacho Ramos (pacho) @ 2012-02-26 13:20 UTC (permalink / raw
To: gentoo-commits
pacho 12/02/26 13:20:59
Modified: ChangeLog eutils.eclass
Log:
Use correct menu categories for app-* as discussed in gentoo-dev.
Revision Changes Path
1.144 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.144&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.144&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.143&r2=1.144
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- ChangeLog 25 Feb 2012 22:56:56 -0000 1.143
+++ ChangeLog 26 Feb 2012 13:20:59 -0000 1.144
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.143 2012/02/25 22:56:56 miska Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.144 2012/02/26 13:20:59 pacho Exp $
+
+ 26 Feb 2012; Pacho Ramos <pacho@gentoo.org> eutils.eclass:
+ Use correct menu categories for app-* as discussed in gentoo-dev.
25 Feb 2012; Michal Hrusecky <miska@gentoo.org> obs-service.eclass:
Improved obs-service eclass to fix paths to suse-build automatically
1.384 eclass/eutils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.384&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.384&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?r1=1.383&r2=1.384
Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.383
retrieving revision 1.384
diff -u -r1.383 -r1.384
--- eutils.eclass 16 Feb 2012 00:27:17 -0000 1.383
+++ eutils.eclass 26 Feb 2012 13:20:59 -0000 1.384
@@ -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/eutils.eclass,v 1.383 2012/02/16 00:27:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.384 2012/02/26 13:20:59 pacho Exp $
# @ECLASS: eutils.eclass
# @MAINTAINER:
@@ -653,22 +653,22 @@
case ${catmaj} in
app)
case ${catmin} in
- accessibility) type=Accessibility;;
+ accessibility) type="Utility;Accessibility";;
admin) type=System;;
antivirus) type=System;;
- arch) type=Archiving;;
- backup) type=Archiving;;
- cdr) type=DiscBurning;;
- dicts) type=Dictionary;;
+ arch) type="Utility;Archiving";;
+ backup) type="Utility;Archiving";;
+ cdr) type="AudioVideo;DiscBurning";;
+ dicts) type="Office;Dictionary";;
doc) type=Documentation;;
- editors) type=TextEditor;;
- emacs) type=TextEditor;;
- emulation) type=Emulator;;
- laptop) type=HardwareSettings;;
+ editors) type="Utility;TextEditor";;
+ emacs) type="Development;TextEditor";;
+ emulation) type="System;Emulator";;
+ laptop) type="Settings;HardwareSettings";;
office) type=Office;;
- pda) type=PDA;;
- vim) type=TextEditor;;
- xemacs) type=TextEditor;;
+ pda) type="Office;PDA";;
+ vim) type="Development;TextEditor";;
+ xemacs) type="Development;TextEditor";;
esac
;;
^ permalink raw reply [flat|nested] 28+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog eutils.eclass
@ 2012-03-01 22:10 Naohiro Aota (naota)
0 siblings, 0 replies; 28+ messages in thread
From: Naohiro Aota (naota) @ 2012-03-01 22:10 UTC (permalink / raw
To: gentoo-commits
naota 12/03/01 22:10:50
Modified: ChangeLog eutils.eclass
Log:
Consider patch alias, #404447
Revision Changes Path
1.151 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.151&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.151&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.150&r2=1.151
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- ChangeLog 1 Mar 2012 15:19:14 -0000 1.150
+++ ChangeLog 1 Mar 2012 22:10:50 -0000 1.151
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.150 2012/03/01 15:19:14 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.151 2012/03/01 22:10:50 naota Exp $
+
+ 01 Mar 2012; Naohiro Aota <naota@gentoo.org> eutils.eclass:
+ Consider patch alias, #404447
01 Mar 2012; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
Cleanup qt_mkspecs_dir().
1.386 eclass/eutils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.386&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.386&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?r1=1.385&r2=1.386
Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.385
retrieving revision 1.386
diff -u -r1.385 -r1.386
--- eutils.eclass 1 Mar 2012 07:00:40 -0000 1.385
+++ eutils.eclass 1 Mar 2012 22:10:50 -0000 1.386
@@ -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/eutils.eclass,v 1.385 2012/03/01 07:00:40 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.386 2012/03/01 22:10:50 naota Exp $
# @ECLASS: eutils.eclass
# @MAINTAINER:
@@ -444,7 +444,7 @@
# Dynamically detect the correct -p# ... i'm lazy, so shoot me :/
local patch_cmd
while [[ ${count} -lt 5 ]] ; do
- patch_cmd="patch -p${count} ${EPATCH_OPTS}"
+ patch_cmd="${BASH_ALIASES[patch]:-patch} -p${count} ${EPATCH_OPTS}"
# Generate some useful debug info ...
(
^ permalink raw reply [flat|nested] 28+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog eutils.eclass
@ 2012-04-02 22:13 Pacho Ramos (pacho)
0 siblings, 0 replies; 28+ messages in thread
From: Pacho Ramos (pacho) @ 2012-04-02 22:13 UTC (permalink / raw
To: gentoo-commits
pacho 12/04/02 22:13:58
Modified: ChangeLog eutils.eclass
Log:
Use einfo instead of ewarn as discussed in http://archives.gentoo.org/gentoo-dev/msg_512b5e4049617666f6637618bd62857a.xml
Revision Changes Path
1.198 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.198&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.198&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.197&r2=1.198
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -r1.197 -r1.198
--- ChangeLog 2 Apr 2012 17:48:06 -0000 1.197
+++ ChangeLog 2 Apr 2012 22:13:57 -0000 1.198
@@ -1,6 +1,11 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.197 2012/04/02 17:48:06 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.198 2012/04/02 22:13:57 pacho Exp $
+
+ 02 Apr 2012; Pacho Ramos <pacho@gentoo.org> eutils.eclass:
+ Use einfo instead of ewarn as discussed in
+ http://archives.gentoo.org/gentoo-dev/msg_512b5e4049617666f6637618bd62857a.xm
+ l
02 Apr 2012; Sergei Trofimovich <slyfox@gentoo.org> darcs.eclass:
Switch from ESCM_OFFLINE var to EVCS_OFFLINE (bug #410467 by Ulrich Müller).
1.388 eclass/eutils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.388&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.388&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?r1=1.387&r2=1.388
Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.387
retrieving revision 1.388
diff -u -r1.387 -r1.388
--- eutils.eclass 23 Mar 2012 02:33:49 -0000 1.387
+++ eutils.eclass 2 Apr 2012 22:13:57 -0000 1.388
@@ -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/eutils.eclass,v 1.387 2012/03/23 02:33:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.388 2012/04/02 22:13:57 pacho Exp $
# @ECLASS: eutils.eclass
# @MAINTAINER:
@@ -1002,7 +1002,7 @@
fi
done
[[ -n ${nols} ]] \
- && ewarn "Sorry, but ${PN} does not support the LINGUAS:" ${nols}
+ && einfo "Sorry, but ${PN} does not support the LINGUAS:" ${nols}
export LINGUAS=${newls:1}
}
^ permalink raw reply [flat|nested] 28+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog eutils.eclass
@ 2012-05-28 16:45 PaweA Hajdan (phajdan.jr)
0 siblings, 0 replies; 28+ messages in thread
From: PaweA Hajdan (phajdan.jr) @ 2012-05-28 16:45 UTC (permalink / raw
To: gentoo-commits
phajdan.jr 12/05/28 16:45:57
Modified: ChangeLog eutils.eclass
Log:
Simplify preserve_old_lib ewarn messages, wrt http://archives.gentoo.org/gentoo-dev/msg_bf159af028ffeeb83c679d6a0eaa73e5.xml . gentoolkit-0.3.0.5 fixing problems blocking this change is now stable on all archs (bug #411479).
Revision Changes Path
1.274 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.274&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.274&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.273&r2=1.274
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.273
retrieving revision 1.274
diff -u -r1.273 -r1.274
--- ChangeLog 28 May 2012 07:46:59 -0000 1.273
+++ ChangeLog 28 May 2012 16:45:57 -0000 1.274
@@ -1,6 +1,12 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.273 2012/05/28 07:46:59 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.274 2012/05/28 16:45:57 phajdan.jr Exp $
+
+ 28 May 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> eutils.eclass:
+ Simplify preserve_old_lib ewarn messages, wrt
+ http://archives.gentoo.org/gentoo-dev/msg_bf159af028ffeeb83c679d6a0eaa73e5.xm
+ l . gentoolkit-0.3.0.5 fixing problems blocking this change is now stable on
+ all archs (bug #411479).
28 May 2012; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
Remove invalid use check, these should be fixed by now.
1.393 eclass/eutils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.393&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.393&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?r1=1.392&r2=1.393
Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.392
retrieving revision 1.393
diff -u -r1.392 -r1.393
--- eutils.eclass 11 May 2012 14:22:01 -0000 1.392
+++ eutils.eclass 28 May 2012 16:45:57 -0000 1.393
@@ -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/eutils.eclass,v 1.392 2012/05/11 14:22:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.393 2012/05/28 16:45:57 phajdan.jr Exp $
# @ECLASS: eutils.eclass
# @MAINTAINER:
@@ -1090,16 +1090,8 @@
fi
# temp hack for #348634 #357225
[[ ${PN} == "mpfr" ]] && lib=${lib##*/}
- ewarn " # revdep-rebuild --library '${lib}'"
+ ewarn " # revdep-rebuild --library '${lib}' && rm '${lib}'"
done
- if [[ ${notice} -eq 1 ]] ; then
- ewarn
- ewarn "Once you've finished running revdep-rebuild, it should be safe to"
- ewarn "delete the old libraries. Here is a copy & paste for the lazy:"
- for lib in "$@" ; do
- ewarn " # rm '${lib}'"
- done
- fi
}
# @FUNCTION: built_with_use
^ permalink raw reply [flat|nested] 28+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog eutils.eclass
@ 2012-06-05 17:40 Julian Ospald (hasufell)
0 siblings, 0 replies; 28+ messages in thread
From: Julian Ospald (hasufell) @ 2012-06-05 17:40 UTC (permalink / raw
To: gentoo-commits
hasufell 12/06/05 17:40:12
Modified: ChangeLog eutils.eclass
Log:
enhanced functionality of doicon/newicon in eutils.eclass
Revision Changes Path
1.289 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.289&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.289&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.288&r2=1.289
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -r1.288 -r1.289
--- ChangeLog 5 Jun 2012 10:21:35 -0000 1.288
+++ ChangeLog 5 Jun 2012 17:40:12 -0000 1.289
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.288 2012/06/05 10:21:35 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.289 2012/06/05 17:40:12 hasufell Exp $
+
+ 05 Jun 2012; Julian Ospald <hasufell@gentoo.org> eutils.eclass:
+ enhanced functionality of doicon/newicon in eutils.eclass
05 Jun 2012; Pacho Ramos <pacho@gentoo.org> stardict.eclass:
Allow more providers for stardict, bug #413093 by tot-to and qt team.
1.394 eclass/eutils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.394&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.394&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?r1=1.393&r2=1.394
Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.393
retrieving revision 1.394
diff -u -r1.393 -r1.394
--- eutils.eclass 28 May 2012 16:45:57 -0000 1.393
+++ eutils.eclass 5 Jun 2012 17:40:12 -0000 1.394
@@ -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/eutils.eclass,v 1.393 2012/05/28 16:45:57 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.394 2012/06/05 17:40:12 hasufell Exp $
# @ECLASS: eutils.eclass
# @MAINTAINER:
@@ -944,45 +944,122 @@
)
}
-# @FUNCTION: doicon
-# @USAGE: <list of icons>
+# @FUNCTION: _iconins
+# @INTERNAL
# @DESCRIPTION:
-# Install the list of icons into the icon directory (/usr/share/pixmaps).
-# This is useful in conjunction with creating desktop/menu files.
-doicon() {
+# function for use in doicon and newicon
+_iconins() {
(
# wrap the env here so that the 'insinto' call
# doesn't corrupt the env of the caller
- local i j ret
- insinto /usr/share/pixmaps
- for i in "$@" ; do
- if [[ -f ${i} ]] ; then
- doins "${i}"
- ((ret+=$?))
- elif [[ -d ${i} ]] ; then
- for j in "${i}"/*.png ; do
- doins "${j}"
- ((ret+=$?))
- done
- else
- ((++ret))
- fi
+ local funcname=$1; shift
+ local size dir
+ local context=apps
+ local theme=hicolor
+
+ while [[ $# -gt 0 ]] ; do
+ case $1 in
+ -s|--size)
+ if [[ ${2%%x*}x${2%%x*} == "$2" ]] ; then
+ size=${2%%x*}
+ else
+ size=${2}
+ fi
+ case ${size} in
+ 16|22|24|32|36|48|64|72|96|128|192|256)
+ size=${size}x${size};;
+ scalable)
+ ;;
+ *)
+ eerror "${size} is an unsupported icon size!"
+ exit 1;;
+ esac
+ shift 2;;
+ -t|--theme)
+ theme=${2}
+ shift 2;;
+ -c|--context)
+ context=${2}
+ shift 2;;
+ *)
+ if [[ -z ${size} ]] ; then
+ insinto /usr/share/pixmaps
+ else
+ insinto /usr/share/icons/${theme}/${size}/${context}
+ fi
+
+ if [[ ${funcname} == doicon ]] ; then
+ if [[ -f $1 ]] ; then
+ doins "${1}"
+ elif [[ -d $1 ]] ; then
+ shopt -s nullglob
+ doins "${1}"/*.{png,svg}
+ shopt -u nullglob
+ else
+ eerror "${1} is not a valid file/directory!"
+ exit 1
+ fi
+ else
+ break
+ fi
+ shift 1;;
+ esac
done
- exit ${ret}
- )
+ if [[ ${funcname} == newicon ]] ; then
+ newins "$@"
+ fi
+ ) || die
+}
+
+# @FUNCTION: doicon
+# @USAGE: [options] <icons>
+# @DESCRIPTION:
+# Install icon into the icon directory /usr/share/icons or into
+# /usr/share/pixmaps if "--size" is not set.
+# This is useful in conjunction with creating desktop/menu files.
+#
+# @CODE
+# options:
+# -s, --size
+# !!! must specify to install into /usr/share/icons/... !!!
+# size of the icon, like 48 or 48x48
+# supported icon sizes are:
+# 16 22 24 32 36 48 64 72 96 128 192 256 scalable
+# -c, --context
+# defaults to "apps"
+# -t, --theme
+# defaults to "hicolor"
+#
+# icons: list of icons
+#
+# example 1: doicon foobar.png fuqbar.svg
+# results in: insinto /usr/share/pixmaps
+# doins foobar.png fuqbar.svg
+#
+# example 2: doicon -s 48 foobar.png fuqbar.png
+# results in: insinto /usr/share/icons/hicolor/48x48/apps
+# doins foobar.png fuqbar.png
+# @CODE
+doicon() {
+ _iconins ${FUNCNAME} "$@"
}
# @FUNCTION: newicon
-# @USAGE: <icon> <newname>
+# @USAGE: [options] <icon> <newname>
# @DESCRIPTION:
-# Like all other new* functions, install the specified icon as newname.
+# Like doicon, install the specified icon as newname.
+#
+# @CODE
+# example 1: newicon foobar.png NEWNAME.png
+# results in: insinto /usr/share/pixmaps
+# newins foobar.png NEWNAME.png
+#
+# example 2: newicon -s 48 foobar.png NEWNAME.png
+# results in: insinto /usr/share/icons/hicolor/48x48/apps
+# newins foobar.png NEWNAME.png
+# @CODE
newicon() {
- (
- # wrap the env here so that the 'insinto' call
- # doesn't corrupt the env of the caller
- insinto /usr/share/pixmaps
- newins "$@"
- )
+ _iconins ${FUNCNAME} "$@"
}
# @FUNCTION: strip-linguas
^ permalink raw reply [flat|nested] 28+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog eutils.eclass
@ 2012-06-06 15:37 Michal Gorny (mgorny)
0 siblings, 0 replies; 28+ messages in thread
From: Michal Gorny (mgorny) @ 2012-06-06 15:37 UTC (permalink / raw
To: gentoo-commits
mgorny 12/06/06 15:37:50
Modified: ChangeLog eutils.eclass
Log:
Introduce prune_libtool_files() for .la file removal. Based on one used by autotools-utils.
Revision Changes Path
1.291 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.291&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.291&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.290&r2=1.291
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -r1.290 -r1.291
--- ChangeLog 5 Jun 2012 18:31:54 -0000 1.290
+++ ChangeLog 6 Jun 2012 15:37:50 -0000 1.291
@@ -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.290 2012/06/05 18:31:54 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.291 2012/06/06 15:37:50 mgorny Exp $
+
+ 06 Jun 2012; Michał Górny <mgorny@gentoo.org> eutils.eclass:
+ Introduce prune_libtool_files() for .la file removal. Based on one used
+ by autotools-utils.
05 Jun 2012; Fabian Groffen <grobian@gentoo.org> autotools.eclass:
Avoid type -P output for glibtoolize, bug #419641
1.395 eclass/eutils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.395&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.395&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?r1=1.394&r2=1.395
Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.394
retrieving revision 1.395
diff -u -r1.394 -r1.395
--- eutils.eclass 5 Jun 2012 17:40:12 -0000 1.394
+++ eutils.eclass 6 Jun 2012 15:37:50 -0000 1.395
@@ -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/eutils.eclass,v 1.394 2012/06/05 17:40:12 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.395 2012/06/06 15:37:50 mgorny Exp $
# @ECLASS: eutils.eclass
# @MAINTAINER:
@@ -18,7 +18,7 @@
if [[ ${___ECLASS_ONCE_EUTILS} != "recur -_+^+_- spank" ]] ; then
___ECLASS_ONCE_EUTILS="recur -_+^+_- spank"
-inherit multilib user
+inherit multilib toolchain-funcs user
DESCRIPTION="Based on the ${ECLASS} eclass"
@@ -1399,6 +1399,100 @@
echo ${jobs:-1}
}
+# @FUNCTION: prune_libtool_files
+# @USAGE: [--all]
+# @DESCRIPTION:
+# Locate unnecessary libtool files (.la) and libtool static archives
+# (.a) and remove them from installation image.
+#
+# By default, .la files are removed whenever the static linkage can
+# either be performed using pkg-config or doesn't introduce additional
+# flags.
+#
+# If '--all' argument is passed, all .la files are removed. This is
+# usually useful when the package installs plugins and does not use .la
+# files for loading them.
+#
+# The .a files are only removed whenever corresponding .la files state
+# that they should not be linked to, i.e. whenever these files
+# correspond to plugins.
+#
+# Note: if your package installs any .pc files, this function implicitly
+# calls pkg-config. You should add it to your DEPEND in that case.
+prune_libtool_files() {
+ debug-print-function ${FUNCNAME} "$@"
+
+ local removing_all opt
+ for opt; do
+ case "${opt}" in
+ --all)
+ removing_all=1
+ ;;
+ *)
+ die "Invalid argument to ${FUNCNAME}(): ${opt}"
+ esac
+ done
+
+ # Create a list of all .pc-covered libs.
+ local pc_libs=()
+ if [[ ! ${removing_all} ]]; then
+ local f
+ local tf=${T}/prune-lt-files.pc
+ local pkgconf=$(tc-getPKG_CONFIG)
+
+ while IFS= read -r -d '' f; do # for all .pc files
+ local arg
+
+ sed -e '/^Requires:/d' "${f}" > "${tf}"
+ for arg in $("${pkgconf}" --libs "${tf}"); do
+ [[ ${arg} == -l* ]] && pc_libs+=( lib${arg#-l}.la )
+ done
+ done < <(find "${D}" -type f -name '*.pc' -print0)
+
+ rm -f "${tf}"
+ fi
+
+ local f
+ while IFS= read -r -d '' f; do # for all .la files
+ local archivefile=${f/%.la/.a}
+
+ [[ ${f} != ${archivefile} ]] || die 'regex sanity check failed'
+
+ # Remove static libs we're not supposed to link against.
+ if grep -q '^shouldnotlink=yes$' "${f}"; then
+ einfo "Removing unnecessary ${archivefile#${D%/}}"
+ rm -f "${archivefile}"
+
+ # The .la file may be used by a module loader, so avoid removing it
+ # unless explicitly requested.
+ [[ ${removing_all} ]] || continue
+ fi
+
+ # Remove .la files when:
+ # - user explicitly wants us to remove all .la files,
+ # - respective static archive doesn't exist,
+ # - they are covered by a .pc file already,
+ # - they don't provide any new information (no libs & no flags).
+ local reason
+ if [[ ${removing_all} ]]; then
+ reason='requested'
+ elif [[ ! -f ${archivefile} ]]; then
+ reason='no static archive'
+ elif has "${f##*/}" "${pc_libs[@]}"; then
+ reason='covered by .pc'
+ elif [[ ! $(sed -nre \
+ "s/^(dependency_libs|inherited_linker_flags)='(.*)'$/\2/p" \
+ "${f}") ]]; then
+ reason='no libs & flags'
+ fi
+
+ if [[ ${reason} ]]; then
+ einfo "Removing unnecessary ${f#${D%/}} (${reason})"
+ rm -f "${f}"
+ fi
+ done < <(find "${D}" -type f -name '*.la' -print0)
+}
+
check_license() { die "you no longer need this as portage supports ACCEPT_LICENSE itself"; }
fi
^ permalink raw reply [flat|nested] 28+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog eutils.eclass
@ 2012-06-14 23:07 Julian Ospald (hasufell)
0 siblings, 0 replies; 28+ messages in thread
From: Julian Ospald (hasufell) @ 2012-06-14 23:07 UTC (permalink / raw
To: gentoo-commits
hasufell 12/06/14 23:07:31
Modified: ChangeLog eutils.eclass
Log:
small enhancement to examples of doicon
Revision Changes Path
1.314 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.314&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.314&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.313&r2=1.314
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.313
retrieving revision 1.314
diff -u -r1.313 -r1.314
--- ChangeLog 13 Jun 2012 12:17:17 -0000 1.313
+++ ChangeLog 14 Jun 2012 23:07:31 -0000 1.314
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.313 2012/06/13 12:17:17 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.314 2012/06/14 23:07:31 hasufell Exp $
+
+ 14 Jun 2012; Julian Ospald <hasufell@gentoo.org> eutils.eclass:
+ small enhancement to examples of doicon
13 Jun 2012; Tomáš Chvátal <scarabeus@gentoo.org> myspell-r2.eclass:
Make the oxt unpacking really work.
1.398 eclass/eutils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.398&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.398&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?r1=1.397&r2=1.398
Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.397
retrieving revision 1.398
diff -u -r1.397 -r1.398
--- eutils.eclass 14 Jun 2012 00:11:38 -0000 1.397
+++ eutils.eclass 14 Jun 2012 23:07:31 -0000 1.398
@@ -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/eutils.eclass,v 1.397 2012/06/14 00:11:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.398 2012/06/14 23:07:31 hasufell Exp $
# @ECLASS: eutils.eclass
# @MAINTAINER:
@@ -1032,13 +1032,13 @@
#
# icons: list of icons
#
-# example 1: doicon foobar.png fuqbar.svg
+# example 1: doicon foobar.png fuqbar.svg suckbar.png
# results in: insinto /usr/share/pixmaps
-# doins foobar.png fuqbar.svg
+# doins foobar.png fuqbar.svg suckbar.png
#
-# example 2: doicon -s 48 foobar.png fuqbar.png
+# example 2: doicon -s 48 foobar.png fuqbar.png gaybar.png
# results in: insinto /usr/share/icons/hicolor/48x48/apps
-# doins foobar.png fuqbar.png
+# doins foobar.png fuqbar.png gaybar.png
# @CODE
doicon() {
_iconins ${FUNCNAME} "$@"
^ permalink raw reply [flat|nested] 28+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog eutils.eclass
@ 2012-06-20 9:26 Michal Gorny (mgorny)
0 siblings, 0 replies; 28+ messages in thread
From: Michal Gorny (mgorny) @ 2012-06-20 9:26 UTC (permalink / raw
To: gentoo-commits
mgorny 12/06/20 09:26:50
Modified: ChangeLog eutils.eclass
Log:
prune_libtool_files(): report .a removal only if it exists, and explain the reasoning for it.
Revision Changes Path
1.321 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.321&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.321&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.320&r2=1.321
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.320
retrieving revision 1.321
diff -u -r1.320 -r1.321
--- ChangeLog 20 Jun 2012 08:49:27 -0000 1.320
+++ ChangeLog 20 Jun 2012 09:26:50 -0000 1.321
@@ -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.320 2012/06/20 08:49:27 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.321 2012/06/20 09:26:50 mgorny Exp $
+
+ 20 Jun 2012; Michał Górny <mgorny@gentoo.org> eutils.eclass:
+ prune_libtool_files(): report .a removal only if it exists, and explain the
+ reasoning for it.
20 Jun 2012; Tomáš Chvátal <scarabeus@gentoo.org> gst-plugins-bad.eclass:
Fix building with newer eapis wrt bug#385841. Noticed by triggered rebuild to
1.400 eclass/eutils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.400&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.400&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?r1=1.399&r2=1.400
Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.399
retrieving revision 1.400
diff -u -r1.399 -r1.400
--- eutils.eclass 14 Jun 2012 23:40:29 -0000 1.399
+++ eutils.eclass 20 Jun 2012 09:26:50 -0000 1.400
@@ -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/eutils.eclass,v 1.399 2012/06/14 23:40:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.400 2012/06/20 09:26:50 mgorny Exp $
# @ECLASS: eutils.eclass
# @MAINTAINER:
@@ -1438,8 +1438,10 @@
# Remove static libs we're not supposed to link against.
if grep -q '^shouldnotlink=yes$' "${f}"; then
- einfo "Removing unnecessary ${archivefile#${D%/}}"
- rm -f "${archivefile}"
+ if [[ -f ${archivefile} ]]; then
+ einfo "Removing unnecessary ${archivefile#${D%/}} (static plugin)"
+ rm -f "${archivefile}"
+ fi
# The .la file may be used by a module loader, so avoid removing it
# unless explicitly requested.
^ permalink raw reply [flat|nested] 28+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog eutils.eclass
@ 2012-08-29 13:42 Michal Gorny (mgorny)
0 siblings, 0 replies; 28+ messages in thread
From: Michal Gorny (mgorny) @ 2012-08-29 13:42 UTC (permalink / raw
To: gentoo-commits
mgorny 12/08/29 13:42:43
Modified: ChangeLog eutils.eclass
Log:
prune_libtool_files: run pkg-config code only if necessary.
Revision Changes Path
1.383 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.383&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.383&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.382&r2=1.383
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.382
retrieving revision 1.383
diff -u -r1.382 -r1.383
--- ChangeLog 28 Aug 2012 15:28:01 -0000 1.382
+++ ChangeLog 29 Aug 2012 13:42:42 -0000 1.383
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.382 2012/08/28 15:28:01 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.383 2012/08/29 13:42:42 mgorny Exp $
+
+ 29 Aug 2012; Michał Górny <mgorny@gentoo.org> eutils.eclass:
+ prune_libtool_files: run pkg-config code only if necessary.
28 Aug 2012; Michael Pagano <mpagano@gentoo.org> linux-mod.eclass:
Remove deprecated and unrecommended parameter -r from depmod
1.402 eclass/eutils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.402&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.402&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?r1=1.401&r2=1.402
Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.401
retrieving revision 1.402
diff -u -r1.401 -r1.402
--- eutils.eclass 20 Aug 2012 19:45:57 -0000 1.401
+++ eutils.eclass 29 Aug 2012 13:42:42 -0000 1.402
@@ -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/eutils.eclass,v 1.401 2012/08/20 19:45:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.402 2012/08/29 13:42:42 mgorny Exp $
# @ECLASS: eutils.eclass
# @MAINTAINER:
@@ -1395,8 +1395,8 @@
# that they should not be linked to, i.e. whenever these files
# correspond to plugins.
#
-# Note: if your package installs any .pc files, this function implicitly
-# calls pkg-config. You should add it to your DEPEND in that case.
+# Note: if your package installs both static libraries and .pc files,
+# you need to add pkg-config to your DEPEND.
prune_libtool_files() {
debug-print-function ${FUNCNAME} "$@"
@@ -1411,25 +1411,6 @@
esac
done
- # Create a list of all .pc-covered libs.
- local pc_libs=()
- if [[ ! ${removing_all} ]]; then
- local f
- local tf=${T}/prune-lt-files.pc
- local pkgconf=$(tc-getPKG_CONFIG)
-
- while IFS= read -r -d '' f; do # for all .pc files
- local arg
-
- sed -e '/^Requires:/d' "${f}" > "${tf}"
- for arg in $("${pkgconf}" --libs "${tf}"); do
- [[ ${arg} == -l* ]] && pc_libs+=( lib${arg#-l}.la )
- done
- done < <(find "${D}" -type f -name '*.pc' -print0)
-
- rm -f "${tf}"
- fi
-
local f
while IFS= read -r -d '' f; do # for all .la files
local archivefile=${f/%.la/.a}
@@ -1453,17 +1434,40 @@
# - respective static archive doesn't exist,
# - they are covered by a .pc file already,
# - they don't provide any new information (no libs & no flags).
- local reason
+ local reason pkgconfig_scanned
if [[ ${removing_all} ]]; then
reason='requested'
elif [[ ! -f ${archivefile} ]]; then
reason='no static archive'
- elif has "${f##*/}" "${pc_libs[@]}"; then
- reason='covered by .pc'
elif [[ ! $(sed -nre \
"s/^(dependency_libs|inherited_linker_flags)='(.*)'$/\2/p" \
"${f}") ]]; then
reason='no libs & flags'
+ else
+ if [[ ! ${pkgconfig_scanned} ]]; then
+ # Create a list of all .pc-covered libs.
+ local pc_libs=()
+ if [[ ! ${removing_all} ]]; then
+ local f
+ local tf=${T}/prune-lt-files.pc
+ local pkgconf=$(tc-getPKG_CONFIG)
+
+ while IFS= read -r -d '' f; do # for all .pc files
+ local arg
+
+ sed -e '/^Requires:/d' "${f}" > "${tf}"
+ for arg in $("${pkgconf}" --libs "${tf}"); do
+ [[ ${arg} == -l* ]] && pc_libs+=( lib${arg#-l}.la )
+ done
+ done < <(find "${D}" -type f -name '*.pc' -print0)
+
+ rm -f "${tf}"
+ fi
+
+ pkgconfig_scanned=1
+ fi
+
+ has "${f##*/}" "${pc_libs[@]}" && reason='covered by .pc'
fi
if [[ ${reason} ]]; then
^ permalink raw reply [flat|nested] 28+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog eutils.eclass
@ 2012-09-27 17:12 Ian Stakenvicius (axs)
0 siblings, 0 replies; 28+ messages in thread
From: Ian Stakenvicius (axs) @ 2012-09-27 17:12 UTC (permalink / raw
To: gentoo-commits
axs 12/09/27 17:12:34
Modified: ChangeLog eutils.eclass
Log:
Made 'usex' declaration conditional on lack of PM or EAPI5+ support
Revision Changes Path
1.415 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.415&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.415&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.414&r2=1.415
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.414
retrieving revision 1.415
diff -u -r1.414 -r1.415
--- ChangeLog 27 Sep 2012 16:35:41 -0000 1.414
+++ ChangeLog 27 Sep 2012 17:12:34 -0000 1.415
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.414 2012/09/27 16:35:41 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.415 2012/09/27 17:12:34 axs Exp $
+
+ 27 Sep 2012; Ian Stakenvicius <axs@gentoo.org> eutils.eclass:
+ Made 'usex' declaration conditional on lack of PM or EAPI5+ support
27 Sep 2012; Ian Stakenvicius <axs@gentoo.org> fortran-2.eclass,
selinux-policy-2.eclass, vdr-plugin-2.eclass, xorg-2.eclass,
1.404 eclass/eutils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.404&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.404&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?r1=1.403&r2=1.404
Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.403
retrieving revision 1.404
diff -u -r1.403 -r1.404
--- eutils.eclass 15 Sep 2012 16:16:53 -0000 1.403
+++ eutils.eclass 27 Sep 2012 17:12:34 -0000 1.404
@@ -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/eutils.eclass,v 1.403 2012/09/15 16:16:53 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.404 2012/09/27 17:12:34 axs Exp $
# @ECLASS: eutils.eclass
# @MAINTAINER:
@@ -1371,9 +1371,13 @@
# @FUNCTION: usex
# @USAGE: <USE flag> [true output] [false output] [true suffix] [false suffix]
# @DESCRIPTION:
+# Proxy to declare usex for package managers or EAPIs that do not provide it
+# and use the package manager implementation when available (i.e. EAPI >= 5).
# If USE flag is set, echo [true output][true suffix] (defaults to "yes"),
# otherwise echo [false output][false suffix] (defaults to "no").
-usex() { use "$1" && echo "${2-yes}$4" || echo "${3-no}$5" ; } #382963
+if ! declare -F usex >/dev/null ; then
+ usex() { use "$1" && echo "${2-yes}$4" || echo "${3-no}$5" ; } #382963
+fi
# @FUNCTION: prune_libtool_files
# @USAGE: [--all]
^ permalink raw reply [flat|nested] 28+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog eutils.eclass
@ 2012-10-11 16:50 Michal Gorny (mgorny)
0 siblings, 0 replies; 28+ messages in thread
From: Michal Gorny (mgorny) @ 2012-10-11 16:50 UTC (permalink / raw
To: gentoo-commits
mgorny 12/10/11 16:50:53
Modified: ChangeLog eutils.eclass
Log:
prune_libtool_files(): fix removing symlinked .la files.
Revision Changes Path
1.436 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.436&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.436&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.435&r2=1.436
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.435
retrieving revision 1.436
diff -u -r1.435 -r1.436
--- ChangeLog 11 Oct 2012 10:51:41 -0000 1.435
+++ ChangeLog 11 Oct 2012 16:50:53 -0000 1.436
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.435 2012/10/11 10:51:41 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.436 2012/10/11 16:50:53 mgorny Exp $
+
+ 11 Oct 2012; Michał Górny <mgorny@gentoo.org> eutils.eclass:
+ prune_libtool_files(): fix removing symlinked .la files.
08 Oct 2012; Michał Górny <mgorny@gentoo.org> +autotools-multilib.eclass:
Introduce autotools-multilib, to simplify building multilib packages with
1.407 eclass/eutils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.407&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.407&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?r1=1.406&r2=1.407
Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.406
retrieving revision 1.407
diff -u -r1.406 -r1.407
--- eutils.eclass 7 Oct 2012 06:22:01 -0000 1.406
+++ eutils.eclass 11 Oct 2012 16:50:53 -0000 1.407
@@ -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/eutils.eclass,v 1.406 2012/10/07 06:22:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.407 2012/10/11 16:50:53 mgorny Exp $
# @ECLASS: eutils.eclass
# @MAINTAINER:
@@ -1414,6 +1414,7 @@
done
local f
+ local queue=()
while IFS= read -r -d '' f; do # for all .la files
local archivefile=${f/%.la/.a}
@@ -1423,7 +1424,7 @@
if grep -q '^shouldnotlink=yes$' "${f}"; then
if [[ -f ${archivefile} ]]; then
einfo "Removing unnecessary ${archivefile#${D%/}} (static plugin)"
- rm -f "${archivefile}"
+ queue+=( "${archivefile}" )
fi
# The .la file may be used by a module loader, so avoid removing it
@@ -1474,9 +1475,13 @@
if [[ ${reason} ]]; then
einfo "Removing unnecessary ${f#${D%/}} (${reason})"
- rm -f "${f}"
+ queue+=( "${f}" )
fi
- done < <(find "${D}" -type f -name '*.la' -print0)
+ done < <(find "${D}" -xtype f -name '*.la' -print0)
+
+ if [[ ${queue[@]} ]]; then
+ rm -f "${queue[@]}"
+ fi
}
check_license() { die "you no longer need this as portage supports ACCEPT_LICENSE itself"; }
^ permalink raw reply [flat|nested] 28+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog eutils.eclass
@ 2012-10-11 16:52 Michal Gorny (mgorny)
0 siblings, 0 replies; 28+ messages in thread
From: Michal Gorny (mgorny) @ 2012-10-11 16:52 UTC (permalink / raw
To: gentoo-commits
mgorny 12/10/11 16:52:05
Modified: ChangeLog eutils.eclass
Log:
prune_libtool_files(): add --modules option to remove modules (plugins) as well.
Revision Changes Path
1.437 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.437&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.437&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.436&r2=1.437
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.436
retrieving revision 1.437
diff -u -r1.436 -r1.437
--- ChangeLog 11 Oct 2012 16:50:53 -0000 1.436
+++ ChangeLog 11 Oct 2012 16:52:05 -0000 1.437
@@ -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.436 2012/10/11 16:50:53 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.437 2012/10/11 16:52:05 mgorny Exp $
+
+ 11 Oct 2012; Michał Górny <mgorny@gentoo.org> eutils.eclass:
+ prune_libtool_files(): add --modules option to remove modules (plugins) as
+ well.
11 Oct 2012; Michał Górny <mgorny@gentoo.org> eutils.eclass:
prune_libtool_files(): fix removing symlinked .la files.
1.408 eclass/eutils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.408&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.408&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?r1=1.407&r2=1.408
Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.407
retrieving revision 1.408
diff -u -r1.407 -r1.408
--- eutils.eclass 11 Oct 2012 16:50:53 -0000 1.407
+++ eutils.eclass 11 Oct 2012 16:52:05 -0000 1.408
@@ -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/eutils.eclass,v 1.407 2012/10/11 16:50:53 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.408 2012/10/11 16:52:05 mgorny Exp $
# @ECLASS: eutils.eclass
# @MAINTAINER:
@@ -1380,7 +1380,7 @@
fi
# @FUNCTION: prune_libtool_files
-# @USAGE: [--all]
+# @USAGE: [--all|--modules]
# @DESCRIPTION:
# Locate unnecessary libtool files (.la) and libtool static archives
# (.a) and remove them from installation image.
@@ -1389,9 +1389,13 @@
# either be performed using pkg-config or doesn't introduce additional
# flags.
#
-# If '--all' argument is passed, all .la files are removed. This is
-# usually useful when the package installs plugins and does not use .la
-# files for loading them.
+# If '--modules' argument is passed, .la files for modules (plugins) are
+# removed as well. This is usually useful when the package installs
+# plugins and the plugin loader does not use .la files.
+#
+# If '--all' argument is passed, all .la files are removed without
+# performing any heuristic on them. You shouldn't ever use that,
+# and instead report a bug in the algorithm instead.
#
# The .a files are only removed whenever corresponding .la files state
# that they should not be linked to, i.e. whenever these files
@@ -1402,11 +1406,15 @@
prune_libtool_files() {
debug-print-function ${FUNCNAME} "$@"
- local removing_all opt
+ local removing_all removing_modules opt
for opt; do
case "${opt}" in
--all)
removing_all=1
+ removing_modules=1
+ ;;
+ --modules)
+ removing_modules=1
;;
*)
die "Invalid argument to ${FUNCNAME}(): ${opt}"
@@ -1420,6 +1428,8 @@
[[ ${f} != ${archivefile} ]] || die 'regex sanity check failed'
+ local reason pkgconfig_scanned
+
# Remove static libs we're not supposed to link against.
if grep -q '^shouldnotlink=yes$' "${f}"; then
if [[ -f ${archivefile} ]]; then
@@ -1429,16 +1439,17 @@
# The .la file may be used by a module loader, so avoid removing it
# unless explicitly requested.
- [[ ${removing_all} ]] || continue
- fi
+ if [[ ${removing_modules} ]]; then
+ reason='module'
+ fi
# Remove .la files when:
# - user explicitly wants us to remove all .la files,
# - respective static archive doesn't exist,
# - they are covered by a .pc file already,
# - they don't provide any new information (no libs & no flags).
- local reason pkgconfig_scanned
- if [[ ${removing_all} ]]; then
+
+ elif [[ ${removing_all} ]]; then
reason='requested'
elif [[ ! -f ${archivefile} ]]; then
reason='no static archive'
^ permalink raw reply [flat|nested] 28+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog eutils.eclass
@ 2012-10-23 21:09 Michal Gorny (mgorny)
0 siblings, 0 replies; 28+ messages in thread
From: Michal Gorny (mgorny) @ 2012-10-23 21:09 UTC (permalink / raw
To: gentoo-commits
mgorny 12/10/23 21:09:39
Modified: ChangeLog eutils.eclass
Log:
prune_libtool_files(): fix variable reuse. Thanks to radhermit for the patch.
Revision Changes Path
1.462 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.462&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.462&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.461&r2=1.462
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.461
retrieving revision 1.462
diff -u -r1.461 -r1.462
--- ChangeLog 23 Oct 2012 20:58:05 -0000 1.461
+++ ChangeLog 23 Oct 2012 21:09:39 -0000 1.462
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.461 2012/10/23 20:58:05 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.462 2012/10/23 21:09:39 mgorny Exp $
+
+ 23 Oct 2012; Michał Górny <mgorny@gentoo.org> eutils.eclass:
+ prune_libtool_files(): fix variable reuse. Thanks to radhermit for the patch.
23 Oct 2012; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass,
python-r1.eclass:
1.409 eclass/eutils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.409&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.409&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?r1=1.408&r2=1.409
Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.408
retrieving revision 1.409
diff -u -r1.408 -r1.409
--- eutils.eclass 11 Oct 2012 16:52:05 -0000 1.408
+++ eutils.eclass 23 Oct 2012 21:09:39 -0000 1.409
@@ -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/eutils.eclass,v 1.408 2012/10/11 16:52:05 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.409 2012/10/23 21:09:39 mgorny Exp $
# @ECLASS: eutils.eclass
# @MAINTAINER:
@@ -1462,14 +1462,14 @@
# Create a list of all .pc-covered libs.
local pc_libs=()
if [[ ! ${removing_all} ]]; then
- local f
+ local pc
local tf=${T}/prune-lt-files.pc
local pkgconf=$(tc-getPKG_CONFIG)
- while IFS= read -r -d '' f; do # for all .pc files
+ while IFS= read -r -d '' pc; do # for all .pc files
local arg
- sed -e '/^Requires:/d' "${f}" > "${tf}"
+ sed -e '/^Requires:/d' "${pc}" > "${tf}"
for arg in $("${pkgconf}" --libs "${tf}"); do
[[ ${arg} == -l* ]] && pc_libs+=( lib${arg#-l}.la )
done
^ permalink raw reply [flat|nested] 28+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog eutils.eclass
@ 2013-02-10 11:42 Michal Gorny (mgorny)
0 siblings, 0 replies; 28+ messages in thread
From: Michal Gorny (mgorny) @ 2013-02-10 11:42 UTC (permalink / raw
To: gentoo-commits
mgorny 13/02/10 11:42:48
Modified: ChangeLog eutils.eclass
Log:
QA-warn if epunt_cxx does not find any checks to punt.
Revision Changes Path
1.670 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.670&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.670&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.669&r2=1.670
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.669
retrieving revision 1.670
diff -u -r1.669 -r1.670
--- ChangeLog 10 Feb 2013 11:41:07 -0000 1.669
+++ ChangeLog 10 Feb 2013 11:42:48 -0000 1.670
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.669 2013/02/10 11:41:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.670 2013/02/10 11:42:48 mgorny Exp $
+
+ 10 Feb 2013; Michał Górny <mgorny@gentoo.org> eutils.eclass:
+ QA-warn if epunt_cxx does not find any checks to punt.
10 Feb 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
Introduce a function to install package for running tests, solving all the
1.410 eclass/eutils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.410&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.410&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?r1=1.409&r2=1.410
Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.409
retrieving revision 1.410
diff -u -r1.409 -r1.410
--- eutils.eclass 23 Oct 2012 21:09:39 -0000 1.409
+++ eutils.eclass 10 Feb 2013 11:42:48 -0000 1.410
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.409 2012/10/23 21:09:39 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.410 2013/02/10 11:42:48 mgorny Exp $
# @ECLASS: eutils.eclass
# @MAINTAINER:
@@ -1269,10 +1269,16 @@
local dir=$1
[[ -z ${dir} ]] && dir=${S}
ebegin "Removing useless C++ checks"
- local f
+ local f any_found
find "${dir}" -name configure | while read f ; do
- patch --no-backup-if-mismatch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
+ patch --no-backup-if-mismatch -p0 "${f}" \
+ "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null \
+ && any_found=1
done
+
+ if [[ -z ${any_found} ]]; then
+ eqawarn "epunt_cxx called unnecessarily (no C++ checks to punt)."
+ fi
eend 0
}
^ permalink raw reply [flat|nested] 28+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog eutils.eclass
@ 2013-02-26 14:36 Michal Gorny (mgorny)
0 siblings, 0 replies; 28+ messages in thread
From: Michal Gorny (mgorny) @ 2013-02-26 14:36 UTC (permalink / raw
To: gentoo-commits
mgorny 13/02/26 14:36:40
Modified: ChangeLog eutils.eclass
Log:
prune_libtool_files: support running without pkg-config installed, using sed fallback.
Revision Changes Path
1.689 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.689&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.689&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.688&r2=1.689
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.688
retrieving revision 1.689
diff -u -r1.688 -r1.689
--- ChangeLog 26 Feb 2013 14:35:13 -0000 1.688
+++ ChangeLog 26 Feb 2013 14:36:40 -0000 1.689
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.688 2013/02/26 14:35:13 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.689 2013/02/26 14:36:40 mgorny Exp $
+
+ 26 Feb 2013; Michał Górny <mgorny@gentoo.org> eutils.eclass:
+ prune_libtool_files: support running without pkg-config installed, using sed
+ fallback.
26 Feb 2013; Michał Górny <mgorny@gentoo.org> python-r1.eclass:
Re-enable split logs, now directly handled by python*_foreach_impl().
1.411 eclass/eutils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.411&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.411&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?r1=1.410&r2=1.411
Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.410
retrieving revision 1.411
diff -u -r1.410 -r1.411
--- eutils.eclass 10 Feb 2013 11:42:48 -0000 1.410
+++ eutils.eclass 26 Feb 2013 14:36:40 -0000 1.411
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.410 2013/02/10 11:42:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.411 2013/02/26 14:36:40 mgorny Exp $
# @ECLASS: eutils.eclass
# @MAINTAINER:
@@ -1407,8 +1407,9 @@
# that they should not be linked to, i.e. whenever these files
# correspond to plugins.
#
-# Note: if your package installs both static libraries and .pc files,
-# you need to add pkg-config to your DEPEND.
+# Note: if your package installs both static libraries and .pc files
+# which use variable substitution for -l flags, you need to add
+# pkg-config to your DEPEND.
prune_libtool_files() {
debug-print-function ${FUNCNAME} "$@"
@@ -1473,11 +1474,27 @@
local pkgconf=$(tc-getPKG_CONFIG)
while IFS= read -r -d '' pc; do # for all .pc files
- local arg
+ local arg libs
- sed -e '/^Requires:/d' "${pc}" > "${tf}"
- for arg in $("${pkgconf}" --libs "${tf}"); do
- [[ ${arg} == -l* ]] && pc_libs+=( lib${arg#-l}.la )
+ # Use pkg-config if available (and works),
+ # fallback to sed.
+ if ${pkgconf} --exists "${pc}" &>/dev/null; then
+ sed -e '/^Requires:/d' "${pc}" > "${tf}"
+ libs=$(${pkgconf} --libs "${tf}")
+ else
+ libs=$(sed -ne 's/^Libs://p' "${pc}")
+ fi
+
+ for arg in ${libs}; do
+ if [[ ${arg} == -l* ]]; then
+ if [[ ${arg} == '*$*' ]]; then
+ eqawarn "${FUNCNAME}: variable substitution likely failed in ${pc}"
+ eqawarn "(arg: ${arg})"
+ eqawarn "Most likely, you need to add virtual/pkgconfig to DEPEND."
+ fi
+
+ pc_libs+=( lib${arg#-l}.la )
+ fi
done
done < <(find "${D}" -type f -name '*.pc' -print0)
^ permalink raw reply [flat|nested] 28+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog eutils.eclass
@ 2013-03-09 17:55 Michal Gorny (mgorny)
0 siblings, 0 replies; 28+ messages in thread
From: Michal Gorny (mgorny) @ 2013-03-09 17:55 UTC (permalink / raw
To: gentoo-commits
mgorny 13/03/09 17:55:39
Modified: ChangeLog eutils.eclass
Log:
Fix epunt_cxx not to subshell.
Revision Changes Path
1.726 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.726&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.726&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.725&r2=1.726
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.725
retrieving revision 1.726
diff -u -r1.725 -r1.726
--- ChangeLog 9 Mar 2013 13:52:55 -0000 1.725
+++ ChangeLog 9 Mar 2013 17:55:39 -0000 1.726
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.725 2013/03/09 13:52:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.726 2013/03/09 17:55:39 mgorny Exp $
+
+ 09 Mar 2013; Michał Górny <mgorny@gentoo.org> eutils.eclass:
+ Fix epunt_cxx not to subshell.
09 Mar 2013; Michał Górny <mgorny@gentoo.org> python-r1.eclass:
Clean up redundant USE flag check calls, replace them with a single call in
1.412 eclass/eutils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.412&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.412&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?r1=1.411&r2=1.412
Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.411
retrieving revision 1.412
diff -u -r1.411 -r1.412
--- eutils.eclass 26 Feb 2013 14:36:40 -0000 1.411
+++ eutils.eclass 9 Mar 2013 17:55:39 -0000 1.412
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.411 2013/02/26 14:36:40 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.412 2013/03/09 17:55:39 mgorny Exp $
# @ECLASS: eutils.eclass
# @MAINTAINER:
@@ -1270,11 +1270,11 @@
[[ -z ${dir} ]] && dir=${S}
ebegin "Removing useless C++ checks"
local f any_found
- find "${dir}" -name configure | while read f ; do
+ while IFS= read -r -d '' f; do
patch --no-backup-if-mismatch -p0 "${f}" \
"${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null \
&& any_found=1
- done
+ done < <(find "${dir}" -name configure -print0)
if [[ -z ${any_found} ]]; then
eqawarn "epunt_cxx called unnecessarily (no C++ checks to punt)."
^ permalink raw reply [flat|nested] 28+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog eutils.eclass
@ 2013-03-09 18:18 Michal Gorny (mgorny)
0 siblings, 0 replies; 28+ messages in thread
From: Michal Gorny (mgorny) @ 2013-03-09 18:18 UTC (permalink / raw
To: gentoo-commits
mgorny 13/03/09 18:18:09
Modified: ChangeLog eutils.eclass
Log:
Disable epunt_cxx warning since epunt_cxx is broken nowadays.
Revision Changes Path
1.727 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.727&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.727&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.726&r2=1.727
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.726
retrieving revision 1.727
diff -u -r1.726 -r1.727
--- ChangeLog 9 Mar 2013 17:55:39 -0000 1.726
+++ ChangeLog 9 Mar 2013 18:18:09 -0000 1.727
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.726 2013/03/09 17:55:39 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.727 2013/03/09 18:18:09 mgorny Exp $
+
+ 09 Mar 2013; Michał Górny <mgorny@gentoo.org> eutils.eclass:
+ Disable epunt_cxx warning since epunt_cxx is broken nowadays.
09 Mar 2013; Michał Górny <mgorny@gentoo.org> eutils.eclass:
Fix epunt_cxx not to subshell.
1.413 eclass/eutils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.413&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.413&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?r1=1.412&r2=1.413
Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.412
retrieving revision 1.413
diff -u -r1.412 -r1.413
--- eutils.eclass 9 Mar 2013 17:55:39 -0000 1.412
+++ eutils.eclass 9 Mar 2013 18:18:09 -0000 1.413
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.412 2013/03/09 17:55:39 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.413 2013/03/09 18:18:09 mgorny Exp $
# @ECLASS: eutils.eclass
# @MAINTAINER:
@@ -1276,9 +1276,9 @@
&& any_found=1
done < <(find "${dir}" -name configure -print0)
- if [[ -z ${any_found} ]]; then
- eqawarn "epunt_cxx called unnecessarily (no C++ checks to punt)."
- fi
+# if [[ -z ${any_found} ]]; then
+# eqawarn "epunt_cxx called unnecessarily (no C++ checks to punt)."
+# fi
eend 0
}
^ permalink raw reply [flat|nested] 28+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog eutils.eclass
@ 2013-05-15 19:01 Michal Gorny (mgorny)
0 siblings, 0 replies; 28+ messages in thread
From: Michal Gorny (mgorny) @ 2013-05-15 19:01 UTC (permalink / raw
To: gentoo-commits
mgorny 13/05/15 19:01:36
Modified: ChangeLog eutils.eclass
Log:
prune_libtool_files: do not remove .la files which are not libtool files. Fixes bug #468380.
Revision Changes Path
1.825 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.825&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.825&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.824&r2=1.825
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.824
retrieving revision 1.825
diff -u -r1.824 -r1.825
--- ChangeLog 15 May 2013 05:42:09 -0000 1.824
+++ ChangeLog 15 May 2013 19:01:36 -0000 1.825
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.824 2013/05/15 05:42:09 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.825 2013/05/15 19:01:36 mgorny Exp $
+
+ 15 May 2013; Michał Górny <mgorny@gentoo.org> eutils.eclass:
+ prune_libtool_files: do not remove .la files which are not libtool files.
+ Fixes bug #468380.
15 May 2013; Ryan Hill <dirtyepic@gentoo.org> toolchain.eclass:
Explicitly disable lto in 4.5 to stop configure from helpfully re-enabling it
1.418 eclass/eutils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.418&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.418&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?r1=1.417&r2=1.418
Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.417
retrieving revision 1.418
diff -u -r1.417 -r1.418
--- eutils.eclass 25 Apr 2013 18:38:02 -0000 1.417
+++ eutils.eclass 15 May 2013 19:01:36 -0000 1.418
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.417 2013/04/25 18:38:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.418 2013/05/15 19:01:36 mgorny Exp $
# @ECLASS: eutils.eclass
# @MAINTAINER:
@@ -1458,11 +1458,12 @@
local archivefile=${f/%.la/.a}
[[ ${f} != ${archivefile} ]] || die 'regex sanity check failed'
-
local reason pkgconfig_scanned
+ local snotlink=$(sed -n -e 's:^shouldnotlink=::p' "${f}")
+
+ if [[ ${snotlink} == yes ]]; then
- # Remove static libs we're not supposed to link against.
- if grep -q '^shouldnotlink=yes$' "${f}"; then
+ # Remove static libs we're not supposed to link against.
if [[ -f ${archivefile} ]]; then
einfo "Removing unnecessary ${archivefile#${D%/}} (static plugin)"
queue+=( "${archivefile}" )
@@ -1474,62 +1475,70 @@
reason='module'
fi
- # Remove .la files when:
- # - user explicitly wants us to remove all .la files,
- # - respective static archive doesn't exist,
- # - they are covered by a .pc file already,
- # - they don't provide any new information (no libs & no flags).
-
- elif [[ ${removing_all} ]]; then
- reason='requested'
- elif [[ ! -f ${archivefile} ]]; then
- reason='no static archive'
- elif [[ ! $(sed -nre \
- "s/^(dependency_libs|inherited_linker_flags)='(.*)'$/\2/p" \
- "${f}") ]]; then
- reason='no libs & flags'
- else
- if [[ ! ${pkgconfig_scanned} ]]; then
- # Create a list of all .pc-covered libs.
- local pc_libs=()
- if [[ ! ${removing_all} ]]; then
- local pc
- local tf=${T}/prune-lt-files.pc
- local pkgconf=$(tc-getPKG_CONFIG)
-
- while IFS= read -r -d '' pc; do # for all .pc files
- local arg libs
-
- # Use pkg-config if available (and works),
- # fallback to sed.
- if ${pkgconf} --exists "${pc}" &>/dev/null; then
- sed -e '/^Requires:/d' "${pc}" > "${tf}"
- libs=$(${pkgconf} --libs "${tf}")
- else
- libs=$(sed -ne 's/^Libs://p' "${pc}")
- fi
-
- for arg in ${libs}; do
- if [[ ${arg} == -l* ]]; then
- if [[ ${arg} == '*$*' ]]; then
- eqawarn "${FUNCNAME}: variable substitution likely failed in ${pc}"
- eqawarn "(arg: ${arg})"
- eqawarn "Most likely, you need to add virtual/pkgconfig to DEPEND."
- fi
+ elif [[ ${snotlink} == no ]]; then
- pc_libs+=( lib${arg#-l}.la )
+ # A valid .la file must have a valid 'shouldnotlink='.
+ # That assumption helps us avoid removing random files
+ # which match '*.la', see bug #468380.
+
+ # Remove .la files when:
+ # - user explicitly wants us to remove all .la files,
+ # - respective static archive doesn't exist,
+ # - they are covered by a .pc file already,
+ # - they don't provide any new information (no libs & no flags).
+
+ if [[ ${removing_all} ]]; then
+ reason='requested'
+ elif [[ ! -f ${archivefile} ]]; then
+ reason='no static archive'
+ elif [[ ! $(sed -nre \
+ "s/^(dependency_libs|inherited_linker_flags)='(.*)'$/\2/p" \
+ "${f}") ]]; then
+ reason='no libs & flags'
+ else
+ if [[ ! ${pkgconfig_scanned} ]]; then
+ # Create a list of all .pc-covered libs.
+ local pc_libs=()
+ if [[ ! ${removing_all} ]]; then
+ local pc
+ local tf=${T}/prune-lt-files.pc
+ local pkgconf=$(tc-getPKG_CONFIG)
+
+ while IFS= read -r -d '' pc; do # for all .pc files
+ local arg libs
+
+ # Use pkg-config if available (and works),
+ # fallback to sed.
+ if ${pkgconf} --exists "${pc}" &>/dev/null; then
+ sed -e '/^Requires:/d' "${pc}" > "${tf}"
+ libs=$(${pkgconf} --libs "${tf}")
+ else
+ libs=$(sed -ne 's/^Libs://p' "${pc}")
fi
- done
- done < <(find "${D}" -type f -name '*.pc' -print0)
- rm -f "${tf}"
- fi
+ for arg in ${libs}; do
+ if [[ ${arg} == -l* ]]; then
+ if [[ ${arg} == '*$*' ]]; then
+ eqawarn "${FUNCNAME}: variable substitution likely failed in ${pc}"
+ eqawarn "(arg: ${arg})"
+ eqawarn "Most likely, you need to add virtual/pkgconfig to DEPEND."
+ fi
- pkgconfig_scanned=1
- fi
+ pc_libs+=( lib${arg#-l}.la )
+ fi
+ done
+ done < <(find "${D}" -type f -name '*.pc' -print0)
- has "${f##*/}" "${pc_libs[@]}" && reason='covered by .pc'
- fi
+ rm -f "${tf}"
+ fi
+
+ pkgconfig_scanned=1
+ fi # pkgconfig_scanned
+
+ has "${f##*/}" "${pc_libs[@]}" && reason='covered by .pc'
+ fi # removal due to .pc
+
+ fi # shouldnotlink==no
if [[ ${reason} ]]; then
einfo "Removing unnecessary ${f#${D%/}} (${reason})"
^ permalink raw reply [flat|nested] 28+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog eutils.eclass
@ 2013-05-21 14:05 Michal Gorny (mgorny)
0 siblings, 0 replies; 28+ messages in thread
From: Michal Gorny (mgorny) @ 2013-05-21 14:05 UTC (permalink / raw
To: gentoo-commits
mgorny 13/05/21 14:05:31
Modified: ChangeLog eutils.eclass
Log:
Replace the .la sanity check by one used in libtool itself. Fixes removing qmake-generated .la files, bug #470206.
Revision Changes Path
1.834 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.834&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.834&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.833&r2=1.834
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.833
retrieving revision 1.834
diff -u -r1.833 -r1.834
--- ChangeLog 21 May 2013 01:31:02 -0000 1.833
+++ ChangeLog 21 May 2013 14:05:31 -0000 1.834
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.833 2013/05/21 01:31:02 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.834 2013/05/21 14:05:31 mgorny Exp $
+
+ 21 May 2013; Michał Górny <mgorny@gentoo.org> eutils.eclass:
+ Replace the .la sanity check by one used in libtool itself. Fixes removing
+ qmake-generated .la files, bug #470206.
21 May 2013; Mike Gilbert <floppym@gentoo.org> distutils-r1.eclass,
python-r1.eclass, python-single-r1.eclass:
1.420 eclass/eutils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.420&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.420&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?r1=1.419&r2=1.420
Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.419
retrieving revision 1.420
diff -u -r1.419 -r1.420
--- eutils.eclass 21 May 2013 02:57:22 -0000 1.419
+++ eutils.eclass 21 May 2013 14:05:31 -0000 1.420
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.419 2013/05/21 02:57:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.420 2013/05/21 14:05:31 mgorny Exp $
# @ECLASS: eutils.eclass
# @MAINTAINER:
@@ -1462,6 +1462,13 @@
while IFS= read -r -d '' f; do # for all .la files
local archivefile=${f/%.la/.a}
+ # The following check is done by libtool itself.
+ # It helps us avoid removing random files which match '*.la',
+ # see bug #468380.
+ if ! sed -n -e '/^# Generated by .*libtool/q0;4q1'; then
+ continue
+ fi
+
[[ ${f} != ${archivefile} ]] || die 'regex sanity check failed'
local reason pkgconfig_scanned
local snotlink=$(sed -n -e 's:^shouldnotlink=::p' "${f}")
@@ -1480,11 +1487,7 @@
reason='module'
fi
- elif [[ ${snotlink} == no ]]; then
-
- # A valid .la file must have a valid 'shouldnotlink='.
- # That assumption helps us avoid removing random files
- # which match '*.la', see bug #468380.
+ else
# Remove .la files when:
# - user explicitly wants us to remove all .la files,
^ permalink raw reply [flat|nested] 28+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog eutils.eclass
@ 2013-05-22 5:10 Michal Gorny (mgorny)
0 siblings, 0 replies; 28+ messages in thread
From: Michal Gorny (mgorny) @ 2013-05-22 5:10 UTC (permalink / raw
To: gentoo-commits
mgorny 13/05/22 05:10:29
Modified: ChangeLog eutils.eclass
Log:
Fix the libtool check, bug #470938.
Revision Changes Path
1.835 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.835&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.835&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.834&r2=1.835
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.834
retrieving revision 1.835
diff -u -r1.834 -r1.835
--- ChangeLog 21 May 2013 14:05:31 -0000 1.834
+++ ChangeLog 22 May 2013 05:10:29 -0000 1.835
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.834 2013/05/21 14:05:31 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.835 2013/05/22 05:10:29 mgorny Exp $
+
+ 22 May 2013; Michał Górny <mgorny@gentoo.org> eutils.eclass:
+ Fix the libtool check, bug #470938.
21 May 2013; Michał Górny <mgorny@gentoo.org> eutils.eclass:
Replace the .la sanity check by one used in libtool itself. Fixes removing
1.421 eclass/eutils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.421&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.421&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?r1=1.420&r2=1.421
Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.420
retrieving revision 1.421
diff -u -r1.420 -r1.421
--- eutils.eclass 21 May 2013 14:05:31 -0000 1.420
+++ eutils.eclass 22 May 2013 05:10:29 -0000 1.421
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.420 2013/05/21 14:05:31 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.421 2013/05/22 05:10:29 mgorny Exp $
# @ECLASS: eutils.eclass
# @MAINTAINER:
@@ -1465,7 +1465,7 @@
# The following check is done by libtool itself.
# It helps us avoid removing random files which match '*.la',
# see bug #468380.
- if ! sed -n -e '/^# Generated by .*libtool/q0;4q1'; then
+ if ! sed -n -e '/^# Generated by .*libtool/q0;4q1' "${f}"; then
continue
fi
^ permalink raw reply [flat|nested] 28+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog eutils.eclass
@ 2013-09-13 11:22 Michal Gorny (mgorny)
0 siblings, 0 replies; 28+ messages in thread
From: Michal Gorny (mgorny) @ 2013-09-13 11:22 UTC (permalink / raw
To: gentoo-commits
mgorny 13/09/13 11:22:52
Modified: ChangeLog eutils.eclass
Log:
Commit the version of einstalldocs() Council agreed upon.
Revision Changes Path
1.961 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.961&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.961&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.960&r2=1.961
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.960
retrieving revision 1.961
diff -u -r1.960 -r1.961
--- ChangeLog 12 Sep 2013 17:31:11 -0000 1.960
+++ ChangeLog 13 Sep 2013 11:22:52 -0000 1.961
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.960 2013/09/12 17:31:11 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.961 2013/09/13 11:22:52 mgorny Exp $
+
+ 13 Sep 2013; Michał Górny <mgorny@gentoo.org> eutils.eclass:
+ Commit the version of einstalldocs() Council agreed upon.
12 Sep 2013; Michał Górny <mgorny@gentoo.org> python-r1.eclass,
python-single-r1.eclass:
1.426 eclass/eutils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.426&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.426&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?r1=1.425&r2=1.426
Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.425
retrieving revision 1.426
diff -u -r1.425 -r1.426
--- eutils.eclass 13 Sep 2013 00:51:46 -0000 1.425
+++ eutils.eclass 13 Sep 2013 11:22:52 -0000 1.426
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.425 2013/09/13 00:51:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.426 2013/09/13 11:22:52 mgorny Exp $
# @ECLASS: eutils.eclass
# @MAINTAINER:
@@ -1645,6 +1645,30 @@
fi
}
+einstalldocs() {
+ debug-print-function ${FUNCNAME} "${@}"
+
+ if ! declare -p DOCS &>/dev/null ; then
+ local d
+ for d in README* ChangeLog AUTHORS NEWS TODO CHANGES \
+ THANKS BUGS FAQ CREDITS CHANGELOG ; do
+ [[ -s ${d} ]] && dodoc "${d}"
+ done
+ elif [[ $(declare -p DOCS) == "declare -a"* ]] ; then
+ [[ ${DOCS[@]} ]] && dodoc -r "${DOCS[@]}"
+ else
+ [[ ${DOCS} ]] && dodoc -r ${DOCS}
+ fi
+
+ if [[ $(declare -p HTML_DOCS 2>/dev/null) == "declare -a"* ]] ; then
+ [[ ${HTML_DOCS[@]} ]] && dohtml -r "${HTML_DOCS[@]}"
+ else
+ [[ ${HTML_DOCS} ]] && dohtml -r ${HTML_DOCS}
+ fi
+
+ return 0
+}
+
check_license() { die "you no longer need this as portage supports ACCEPT_LICENSE itself"; }
fi
^ permalink raw reply [flat|nested] 28+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog eutils.eclass
@ 2013-09-14 19:00 Michal Gorny (mgorny)
0 siblings, 0 replies; 28+ messages in thread
From: Michal Gorny (mgorny) @ 2013-09-14 19:00 UTC (permalink / raw
To: gentoo-commits
mgorny 13/09/14 19:00:10
Modified: ChangeLog eutils.eclass
Log:
Support EAPIs < 4 in einstalldocs properly.
Revision Changes Path
1.964 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.964&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.964&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.963&r2=1.964
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.963
retrieving revision 1.964
diff -u -r1.963 -r1.964
--- ChangeLog 13 Sep 2013 15:08:37 -0000 1.963
+++ ChangeLog 14 Sep 2013 19:00:10 -0000 1.964
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.963 2013/09/13 15:08:37 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.964 2013/09/14 19:00:10 mgorny Exp $
+
+ 14 Sep 2013; Michał Górny <mgorny@gentoo.org> eutils.eclass:
+ Support EAPIs < 4 in einstalldocs properly.
13 Sep 2013; Michał Górny <mgorny@gentoo.org> git-r3.eclass:
Fail early on unreachable URLs. If ls-remote fails due to server being
1.427 eclass/eutils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.427&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.427&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?r1=1.426&r2=1.427
Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.426
retrieving revision 1.427
diff -u -r1.426 -r1.427
--- eutils.eclass 13 Sep 2013 11:22:52 -0000 1.426
+++ eutils.eclass 14 Sep 2013 19:00:10 -0000 1.427
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.426 2013/09/13 11:22:52 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.427 2013/09/14 19:00:10 mgorny Exp $
# @ECLASS: eutils.eclass
# @MAINTAINER:
@@ -1648,22 +1648,35 @@
einstalldocs() {
debug-print-function ${FUNCNAME} "${@}"
+ local dodoc_opts=-r
+ has ${EAPI} 0 1 2 3 && dodoc_opts=
+
if ! declare -p DOCS &>/dev/null ; then
local d
for d in README* ChangeLog AUTHORS NEWS TODO CHANGES \
THANKS BUGS FAQ CREDITS CHANGELOG ; do
- [[ -s ${d} ]] && dodoc "${d}"
+ if [[ -s ${d} ]] ; then
+ dodoc "${d}" || die
+ fi
done
elif [[ $(declare -p DOCS) == "declare -a"* ]] ; then
- [[ ${DOCS[@]} ]] && dodoc -r "${DOCS[@]}"
+ if [[ ${DOCS[@]} ]] ; then
+ dodoc ${dodoc_opts} "${DOCS[@]}" || die
+ fi
else
- [[ ${DOCS} ]] && dodoc -r ${DOCS}
+ if [[ ${DOCS} ]] ; then
+ dodoc ${dodoc_opts} ${DOCS} || die
+ fi
fi
if [[ $(declare -p HTML_DOCS 2>/dev/null) == "declare -a"* ]] ; then
- [[ ${HTML_DOCS[@]} ]] && dohtml -r "${HTML_DOCS[@]}"
+ if [[ ${HTML_DOCS[@]} ]] ; then
+ dohtml -r "${HTML_DOCS[@]}" || die
+ fi
else
- [[ ${HTML_DOCS} ]] && dohtml -r ${HTML_DOCS}
+ if [[ ${HTML_DOCS} ]] ; then
+ dohtml -r ${HTML_DOCS} || die
+ fi
fi
return 0
^ permalink raw reply [flat|nested] 28+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog eutils.eclass
@ 2013-12-27 9:28 Michal Gorny (mgorny)
0 siblings, 0 replies; 28+ messages in thread
From: Michal Gorny (mgorny) @ 2013-12-27 9:28 UTC (permalink / raw
To: gentoo-commits
mgorny 13/12/27 09:28:42
Modified: ChangeLog eutils.eclass
Log:
Document einstalldocs.
Revision Changes Path
1.1089 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1089&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1089&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1088&r2=1.1089
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1088
retrieving revision 1.1089
diff -u -r1.1088 -r1.1089
--- ChangeLog 26 Dec 2013 07:11:48 -0000 1.1088
+++ ChangeLog 27 Dec 2013 09:28:41 -0000 1.1089
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1088 2013/12/26 07:11:48 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1089 2013/12/27 09:28:41 mgorny Exp $
+
+ 27 Dec 2013; Michał Górny <mgorny@gentoo.org> eutils.eclass:
+ Document einstalldocs.
26 Dec 2013; Hans de Graaff <graaff@gentoo.org> ruby-ng.eclass:
Add support for the ruby21 target.
1.429 eclass/eutils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.429&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.429&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?r1=1.428&r2=1.429
Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.428
retrieving revision 1.429
diff -u -r1.428 -r1.429
--- eutils.eclass 3 Dec 2013 08:09:49 -0000 1.428
+++ eutils.eclass 27 Dec 2013 09:28:42 -0000 1.429
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.428 2013/12/03 08:09:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.429 2013/12/27 09:28:42 mgorny Exp $
# @ECLASS: eutils.eclass
# @MAINTAINER:
@@ -1666,6 +1666,30 @@
fi
}
+# @FUNCTION: prune_libtool_files
+# @DESCRIPTION:
+# Install documentation using DOCS and HTML_DOCS.
+#
+# If DOCS is declared and non-empty, all files listed in it are
+# installed. The files must exist, otherwise the function will fail.
+# In EAPI 4 and subsequent EAPIs DOCS may specify directories as well,
+# in other EAPIs using directories is unsupported.
+#
+# If DOCS is not declared, the files matching patterns given
+# in the default EAPI implementation of src_install will be installed.
+# If this is undesired, DOCS can be set to empty value to prevent any
+# documentation from being installed.
+#
+# If HTML_DOCS is declared and non-empty, all files and/or directories
+# listed in it are installed as HTML docs (using dohtml).
+#
+# Both DOCS and HTML_DOCS can either be an array or a whitespace-
+# separated list. Whenever directories are allowed, '<directory>/.' may
+# be specified in order to install all files within the directory
+# without creating a sub-directory in docdir.
+#
+# Passing additional options to dodoc and dohtml is not supported.
+# If you needed such a thing, you need to call those helpers explicitly.
einstalldocs() {
debug-print-function ${FUNCNAME} "${@}"
^ permalink raw reply [flat|nested] 28+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog eutils.eclass
@ 2013-12-28 17:19 Michal Gorny (mgorny)
0 siblings, 0 replies; 28+ messages in thread
From: Michal Gorny (mgorny) @ 2013-12-28 17:19 UTC (permalink / raw
To: gentoo-commits
mgorny 13/12/28 17:19:10
Modified: ChangeLog eutils.eclass
Log:
Fix eclassdoc for einstalldocs.
Revision Changes Path
1.1099 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1099&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1099&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1098&r2=1.1099
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1098
retrieving revision 1.1099
diff -u -r1.1098 -r1.1099
--- ChangeLog 28 Dec 2013 09:12:39 -0000 1.1098
+++ ChangeLog 28 Dec 2013 17:19:10 -0000 1.1099
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1098 2013/12/28 09:12:39 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1099 2013/12/28 17:19:10 mgorny Exp $
+
+ 28 Dec 2013; Michał Górny <mgorny@gentoo.org> eutils.eclass:
+ Fix eclassdoc for einstalldocs.
28 Dec 2013; Ryan Hill <dirtyepic@gentoo.org> toolchain.eclass:
Missed one.
1.430 eclass/eutils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.430&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.430&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?r1=1.429&r2=1.430
Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.429
retrieving revision 1.430
diff -u -r1.429 -r1.430
--- eutils.eclass 27 Dec 2013 09:28:42 -0000 1.429
+++ eutils.eclass 28 Dec 2013 17:19:10 -0000 1.430
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.429 2013/12/27 09:28:42 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.430 2013/12/28 17:19:10 mgorny Exp $
# @ECLASS: eutils.eclass
# @MAINTAINER:
@@ -1666,7 +1666,7 @@
fi
}
-# @FUNCTION: prune_libtool_files
+# @FUNCTION: einstalldocs
# @DESCRIPTION:
# Install documentation using DOCS and HTML_DOCS.
#
^ permalink raw reply [flat|nested] 28+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog eutils.eclass
@ 2014-12-30 7:24 William Hubbs (williamh)
0 siblings, 0 replies; 28+ messages in thread
From: William Hubbs (williamh) @ 2014-12-30 7:24 UTC (permalink / raw
To: gentoo-commits
williamh 14/12/30 07:24:52
Modified: ChangeLog eutils.eclass
Log:
Modify eutils.eclass to allow 512x512 icons to be installed (this was
approved by ssuominen).
Revision Changes Path
1.1490 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1490&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1490&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1489&r2=1.1490
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1489
retrieving revision 1.1490
diff -u -r1.1489 -r1.1490
--- ChangeLog 28 Dec 2014 22:55:58 -0000 1.1489
+++ ChangeLog 30 Dec 2014 07:24:52 -0000 1.1490
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1489 2014/12/28 22:55:58 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1490 2014/12/30 07:24:52 williamh Exp $
+
+ 30 Dec 2014; William Hubbs <williamh@gentoo.org> eutils.eclass:
+ Allow 512x512 icons to be installed (this was approved by ssuominen).
28 Dec 2014; Gilles Dartiguelongue <eva@gentoo.org> gstreamer.eclass:
Add workaround for new orc break gstreamer ebuilds, bug #533664.
1.441 eclass/eutils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.441&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.441&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?r1=1.440&r2=1.441
Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.440
retrieving revision 1.441
diff -u -r1.440 -r1.441
--- eutils.eclass 15 Nov 2014 09:49:10 -0000 1.440
+++ eutils.eclass 30 Dec 2014 07:24:52 -0000 1.441
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.440 2014/11/15 09:49:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.441 2014/12/30 07:24:52 williamh Exp $
# @ECLASS: eutils.eclass
# @MAINTAINER:
@@ -1082,7 +1082,7 @@
size=${2}
fi
case ${size} in
- 16|22|24|32|36|48|64|72|96|128|192|256)
+ 16|22|24|32|36|48|64|72|96|128|192|256|512)
size=${size}x${size};;
scalable)
;;
^ permalink raw reply [flat|nested] 28+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog eutils.eclass
@ 2015-01-14 22:50 Michal Gorny (mgorny)
0 siblings, 0 replies; 28+ messages in thread
From: Michal Gorny (mgorny) @ 2015-01-14 22:50 UTC (permalink / raw
To: gentoo-commits
mgorny 15/01/14 22:50:02
Modified: ChangeLog eutils.eclass
Log:
prune_libtool_files: properly reset variables for following loop iterations.
Revision Changes Path
1.1511 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1511&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1511&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1510&r2=1.1511
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1510
retrieving revision 1.1511
diff -u -r1.1510 -r1.1511
--- ChangeLog 13 Jan 2015 21:35:29 -0000 1.1510
+++ ChangeLog 14 Jan 2015 22:50:01 -0000 1.1511
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1510 2015/01/13 21:35:29 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1511 2015/01/14 22:50:01 mgorny Exp $
+
+ 14 Jan 2015; Michał Górny <mgorny@gentoo.org> eutils.eclass:
+ prune_libtool_files: properly reset variables for following loop iterations.
13 Jan 2015; Michał Górny <mgorny@gentoo.org> python-r1.eclass:
Deprecate python_export_best() verbosely.
1.442 eclass/eutils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.442&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.442&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?r1=1.441&r2=1.442
Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.441
retrieving revision 1.442
diff -u -r1.441 -r1.442
--- eutils.eclass 30 Dec 2014 07:24:52 -0000 1.441
+++ eutils.eclass 14 Jan 2015 22:50:02 -0000 1.442
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.441 2014/12/30 07:24:52 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.442 2015/01/14 22:50:02 mgorny Exp $
# @ECLASS: eutils.eclass
# @MAINTAINER:
@@ -1578,7 +1578,7 @@
fi
[[ ${f} != ${archivefile} ]] || die 'regex sanity check failed'
- local reason pkgconfig_scanned
+ local reason= pkgconfig_scanned=
local snotlink=$(sed -n -e 's:^shouldnotlink=::p' "${f}")
if [[ ${snotlink} == yes ]]; then
^ permalink raw reply [flat|nested] 28+ messages in thread
end of thread, other threads:[~2015-01-14 22:50 UTC | newest]
Thread overview: 28+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-14 19:00 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog eutils.eclass Michal Gorny (mgorny)
-- strict thread matches above, loose matches on Subject: below --
2015-01-14 22:50 Michal Gorny (mgorny)
2014-12-30 7:24 William Hubbs (williamh)
2013-12-28 17:19 Michal Gorny (mgorny)
2013-12-27 9:28 Michal Gorny (mgorny)
2013-09-13 11:22 Michal Gorny (mgorny)
2013-05-22 5:10 Michal Gorny (mgorny)
2013-05-21 14:05 Michal Gorny (mgorny)
2013-05-15 19:01 Michal Gorny (mgorny)
2013-03-09 18:18 Michal Gorny (mgorny)
2013-03-09 17:55 Michal Gorny (mgorny)
2013-02-26 14:36 Michal Gorny (mgorny)
2013-02-10 11:42 Michal Gorny (mgorny)
2012-10-23 21:09 Michal Gorny (mgorny)
2012-10-11 16:52 Michal Gorny (mgorny)
2012-10-11 16:50 Michal Gorny (mgorny)
2012-09-27 17:12 Ian Stakenvicius (axs)
2012-08-29 13:42 Michal Gorny (mgorny)
2012-06-20 9:26 Michal Gorny (mgorny)
2012-06-14 23:07 Julian Ospald (hasufell)
2012-06-06 15:37 Michal Gorny (mgorny)
2012-06-05 17:40 Julian Ospald (hasufell)
2012-05-28 16:45 PaweA Hajdan (phajdan.jr)
2012-04-02 22:13 Pacho Ramos (pacho)
2012-03-01 22:10 Naohiro Aota (naota)
2012-02-26 13:20 Pacho Ramos (pacho)
2011-12-17 3:57 Maciej Mrozowski (reavertm)
2011-12-02 10:22 Brian Harring (ferringb)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox