| 1 |
williamh 12/09/29 20:38:12 |
| 2 |
|
| 3 |
Modified: openrc-9999.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
The code in pkg_setup and make_args is only run once at the start of src_compile, so we can move it into that function, thanks to Zac Medico for the input. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha134/cvs/Linux i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.109 sys-apps/openrc/openrc-9999.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.109&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.109&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.108&r2=1.109 |
| 15 |
|
| 16 |
Index: openrc-9999.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v |
| 19 |
retrieving revision 1.108 |
| 20 |
retrieving revision 1.109 |
| 21 |
diff -u -r1.108 -r1.109 |
| 22 |
--- openrc-9999.ebuild 29 Sep 2012 03:15:54 -0000 1.108 |
| 23 |
+++ openrc-9999.ebuild 29 Sep 2012 20:38:12 -0000 1.109 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2012 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.108 2012/09/29 03:15:54 heroxbd Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.109 2012/09/29 20:38:12 williamh Exp $ |
| 29 |
|
| 30 |
EAPI=4 |
| 31 |
|
| 32 |
@@ -35,7 +35,20 @@ |
| 33 |
DEPEND="${RDEPEND} |
| 34 |
virtual/os-headers" |
| 35 |
|
| 36 |
-make_args() { |
| 37 |
+src_prepare() { |
| 38 |
+ sed -i 's:0444:0644:' mk/sys.mk || die |
| 39 |
+ sed -i "/^DIR/s:/openrc:/${PF}:" doc/Makefile || die #241342 |
| 40 |
+ |
| 41 |
+ if [[ ${PV} == "9999" ]] ; then |
| 42 |
+ local ver="git-${EGIT_VERSION:0:6}" |
| 43 |
+ sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die |
| 44 |
+ fi |
| 45 |
+ |
| 46 |
+ # Allow user patches to be applied without modifying the ebuild |
| 47 |
+ epatch_user |
| 48 |
+} |
| 49 |
+ |
| 50 |
+src_compile() { |
| 51 |
unset LIBDIR #266688 |
| 52 |
|
| 53 |
MAKE_ARGS="${MAKE_ARGS} |
| 54 |
@@ -59,29 +72,9 @@ |
| 55 |
fi |
| 56 |
use newnet || MAKE_ARGS="${MAKE_ARGS} MKNET=oldnet" |
| 57 |
use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}" |
| 58 |
-} |
| 59 |
- |
| 60 |
-pkg_setup() { |
| 61 |
export DEBUG=$(usev debug) |
| 62 |
export MKPAM=$(usev pam) |
| 63 |
export MKTERMCAP=$(usev ncurses) |
| 64 |
-} |
| 65 |
- |
| 66 |
-src_prepare() { |
| 67 |
- sed -i 's:0444:0644:' mk/sys.mk || die |
| 68 |
- sed -i "/^DIR/s:/openrc:/${PF}:" doc/Makefile || die #241342 |
| 69 |
- |
| 70 |
- if [[ ${PV} == "9999" ]] ; then |
| 71 |
- local ver="git-${EGIT_VERSION:0:6}" |
| 72 |
- sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die |
| 73 |
- fi |
| 74 |
- |
| 75 |
- # Allow user patches to be applied without modifying the ebuild |
| 76 |
- epatch_user |
| 77 |
-} |
| 78 |
- |
| 79 |
-src_compile() { |
| 80 |
- make_args |
| 81 |
|
| 82 |
tc-export CC AR RANLIB |
| 83 |
emake ${MAKE_ARGS} |
| 84 |
@@ -101,7 +94,6 @@ |
| 85 |
} |
| 86 |
|
| 87 |
src_install() { |
| 88 |
- [[ -z "${MAKE_ARGS}" ]] && make_args |
| 89 |
emake ${MAKE_ARGS} DESTDIR="${D}" install |
| 90 |
|
| 91 |
# move the shared libs back to /usr so ldscript can install |
| 92 |
|
| 93 |
|
| 94 |
|
| 95 |
1.231 sys-apps/openrc/ChangeLog |
| 96 |
|
| 97 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.231&view=markup |
| 98 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.231&content-type=text/plain |
| 99 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?r1=1.230&r2=1.231 |
| 100 |
|
| 101 |
Index: ChangeLog |
| 102 |
=================================================================== |
| 103 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v |
| 104 |
retrieving revision 1.230 |
| 105 |
retrieving revision 1.231 |
| 106 |
diff -u -r1.230 -r1.231 |
| 107 |
--- ChangeLog 29 Sep 2012 03:15:54 -0000 1.230 |
| 108 |
+++ ChangeLog 29 Sep 2012 20:38:12 -0000 1.231 |
| 109 |
@@ -1,6 +1,11 @@ |
| 110 |
# ChangeLog for sys-apps/openrc |
| 111 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 112 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.230 2012/09/29 03:15:54 heroxbd Exp $ |
| 113 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.231 2012/09/29 20:38:12 williamh Exp $ |
| 114 |
+ |
| 115 |
+ 29 Sep 2012; William Hubbs <williamh@g.o> openrc-9999.ebuild: |
| 116 |
+ The code in pkg_setup and make_args is only run once at the start of |
| 117 |
+ src_compile, so we can move it into that function, thanks to Zac Medico for |
| 118 |
+ the input. |
| 119 |
|
| 120 |
29 Sep 2012; Benda Xu <heroxbd@g.o> openrc-9999.ebuild: |
| 121 |
make_args should be called only once; ED -> D in src_install to avoid double |
Archives