* [gentoo-commits] gentoo-x86 commit in app-shells/dash: dash-0.5.6.1-r1.ebuild ChangeLog
@ 2010-08-27 18:40 Mike Frysinger (vapier)
0 siblings, 0 replies; 3+ messages in thread
From: Mike Frysinger (vapier) @ 2010-08-27 18:40 UTC (permalink / raw
To: gentoo-commits
vapier 10/08/27 18:40:59
Modified: dash-0.5.6.1-r1.ebuild ChangeLog
Log:
Require static-libs isn't built with USE=static-libs #334693 by Rebecca Menessec.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.2 app-shells/dash/dash-0.5.6.1-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/dash/dash-0.5.6.1-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/dash/dash-0.5.6.1-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/dash/dash-0.5.6.1-r1.ebuild?r1=1.1&r2=1.2
Index: dash-0.5.6.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-shells/dash/dash-0.5.6.1-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dash-0.5.6.1-r1.ebuild 22 Aug 2010 20:24:45 -0000 1.1
+++ dash-0.5.6.1-r1.ebuild 27 Aug 2010 18:40:59 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/dash/dash-0.5.6.1-r1.ebuild,v 1.1 2010/08/22 20:24:45 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/dash/dash-0.5.6.1-r1.ebuild,v 1.2 2010/08/27 18:40:59 vapier Exp $
EAPI="2"
@@ -21,7 +21,7 @@
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
IUSE="libedit static"
-DEPEND="libedit? ( dev-libs/libedit )"
+DEPEND="libedit? ( dev-libs/libedit static? ( dev-libs/libedit[-static-libs] ) )"
S=${WORKDIR}/${MY_P}
1.77 app-shells/dash/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/dash/ChangeLog?rev=1.77&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/dash/ChangeLog?rev=1.77&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/dash/ChangeLog?r1=1.76&r2=1.77
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-shells/dash/ChangeLog,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- ChangeLog 22 Aug 2010 20:24:45 -0000 1.76
+++ ChangeLog 27 Aug 2010 18:40:59 -0000 1.77
@@ -1,6 +1,10 @@
# ChangeLog for app-shells/dash
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+ 27 Aug 2010; Mike Frysinger <vapier@gentoo.org> dash-0.5.6.1-r1.ebuild:
+ Require static-libs isn't built with USE=static-libs #334693 by Rebecca
+ Menessec.
+
*dash-0.5.6.1-r1 (22 Aug 2010)
22 Aug 2010; Harald van Dijk <truedfx@gentoo.org> -dash-0.5.6.1.ebuild,
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-shells/dash: dash-0.5.6.1-r1.ebuild ChangeLog
@ 2010-09-11 15:39 Mike Frysinger (vapier)
0 siblings, 0 replies; 3+ messages in thread
From: Mike Frysinger (vapier) @ 2010-09-11 15:39 UTC (permalink / raw
To: gentoo-commits
vapier 10/09/11 15:39:57
Modified: dash-0.5.6.1-r1.ebuild ChangeLog
Log:
Fix inverted static-libs depend #334693.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.3 app-shells/dash/dash-0.5.6.1-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/dash/dash-0.5.6.1-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/dash/dash-0.5.6.1-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/dash/dash-0.5.6.1-r1.ebuild?r1=1.2&r2=1.3
Index: dash-0.5.6.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-shells/dash/dash-0.5.6.1-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dash-0.5.6.1-r1.ebuild 27 Aug 2010 18:40:59 -0000 1.2
+++ dash-0.5.6.1-r1.ebuild 11 Sep 2010 15:39:57 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/dash/dash-0.5.6.1-r1.ebuild,v 1.2 2010/08/27 18:40:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/dash/dash-0.5.6.1-r1.ebuild,v 1.3 2010/09/11 15:39:57 vapier Exp $
EAPI="2"
@@ -21,7 +21,7 @@
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
IUSE="libedit static"
-DEPEND="libedit? ( dev-libs/libedit static? ( dev-libs/libedit[-static-libs] ) )"
+DEPEND="libedit? ( dev-libs/libedit static? ( dev-libs/libedit[static-libs] ) )"
S=${WORKDIR}/${MY_P}
1.78 app-shells/dash/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/dash/ChangeLog?rev=1.78&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/dash/ChangeLog?rev=1.78&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/dash/ChangeLog?r1=1.77&r2=1.78
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-shells/dash/ChangeLog,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- ChangeLog 27 Aug 2010 18:40:59 -0000 1.77
+++ ChangeLog 11 Sep 2010 15:39:57 -0000 1.78
@@ -1,6 +1,9 @@
# ChangeLog for app-shells/dash
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+ 11 Sep 2010; Mike Frysinger <vapier@gentoo.org> dash-0.5.6.1-r1.ebuild:
+ Fix inverted static-libs depend #334693.
+
27 Aug 2010; Mike Frysinger <vapier@gentoo.org> dash-0.5.6.1-r1.ebuild:
Require static-libs isn't built with USE=static-libs #334693 by Rebecca
Menessec.
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-shells/dash: dash-0.5.6.1-r1.ebuild ChangeLog
@ 2010-09-11 16:06 Mike Frysinger (vapier)
0 siblings, 0 replies; 3+ messages in thread
From: Mike Frysinger (vapier) @ 2010-09-11 16:06 UTC (permalink / raw
To: gentoo-commits
vapier 10/09/11 16:06:45
Modified: dash-0.5.6.1-r1.ebuild ChangeLog
Log:
Drop forced libedit static linking #334693.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.4 app-shells/dash/dash-0.5.6.1-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/dash/dash-0.5.6.1-r1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/dash/dash-0.5.6.1-r1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/dash/dash-0.5.6.1-r1.ebuild?r1=1.3&r2=1.4
Index: dash-0.5.6.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-shells/dash/dash-0.5.6.1-r1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dash-0.5.6.1-r1.ebuild 11 Sep 2010 15:39:57 -0000 1.3
+++ dash-0.5.6.1-r1.ebuild 11 Sep 2010 16:06:45 -0000 1.4
@@ -1,10 +1,10 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/dash/dash-0.5.6.1-r1.ebuild,v 1.3 2010/09/11 15:39:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/dash/dash-0.5.6.1-r1.ebuild,v 1.4 2010/09/11 16:06:45 vapier Exp $
EAPI="2"
-inherit autotools eutils flag-o-matic
+inherit autotools eutils flag-o-matic toolchain-funcs
DEB_PV=${PV%.*}
DEB_PATCH=${PV##*.}
@@ -21,7 +21,10 @@
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
IUSE="libedit static"
-DEPEND="libedit? ( dev-libs/libedit static? ( dev-libs/libedit[static-libs] ) )"
+RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )"
+DEPEND="${RDEPEND}
+ dev-util/pkgconfig
+ libedit? ( static? ( dev-libs/libedit[static-libs] ) )"
S=${WORKDIR}/${MY_P}
@@ -35,11 +38,8 @@
# Fix the invalid sort
sed -i -e 's/LC_COLLATE=C/LC_ALL=C/g' src/mkbuiltins
- # Always statically link libedit in to ensure we always boot if it changes
- # which it has done in the past.
- local s="s/-ledit/-Wl,-Bstatic -ledit -Wl,-Bdynamic -lcurses/g"
- use static && s="s/-ledit/-ledit -lcurses/g"
- sed -i -e "${s}" configure.ac || die "Failed to sed configure.ac"
+ # Use pkg-config for libedit linkage
+ sed -i "/LIBS/s:-ledit:\`$(tc-getPKG_CONFIG) --libs libedit $(use static && echo --static)\`:" configure.ac
# May as well, as the debian patches force this anyway
eautoreconf
1.79 app-shells/dash/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/dash/ChangeLog?rev=1.79&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/dash/ChangeLog?rev=1.79&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/dash/ChangeLog?r1=1.78&r2=1.79
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-shells/dash/ChangeLog,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- ChangeLog 11 Sep 2010 15:39:57 -0000 1.78
+++ ChangeLog 11 Sep 2010 16:06:45 -0000 1.79
@@ -2,6 +2,9 @@
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
11 Sep 2010; Mike Frysinger <vapier@gentoo.org> dash-0.5.6.1-r1.ebuild:
+ Drop forced libedit static linking #334693.
+
+ 11 Sep 2010; Mike Frysinger <vapier@gentoo.org> dash-0.5.6.1-r1.ebuild:
Fix inverted static-libs depend #334693.
27 Aug 2010; Mike Frysinger <vapier@gentoo.org> dash-0.5.6.1-r1.ebuild:
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-09-11 16:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-11 16:06 [gentoo-commits] gentoo-x86 commit in app-shells/dash: dash-0.5.6.1-r1.ebuild ChangeLog Mike Frysinger (vapier)
-- strict thread matches above, loose matches on Subject: below --
2010-09-11 15:39 Mike Frysinger (vapier)
2010-08-27 18:40 Mike Frysinger (vapier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox