1 |
zzam 09/01/31 14:34:36 |
2 |
|
3 |
Modified: ChangeLog openrc-9999.ebuild openrc-0.4.2.ebuild |
4 |
Log: |
5 |
Sync 0.4.2 and 9999 ebuild. This does not change anything for 0.4.2 ebuild. |
6 |
(Portage version: 2.1.6.7/cvs/Linux i686) |
7 |
|
8 |
Revision Changes Path |
9 |
1.61 sys-apps/openrc/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.61&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.61&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/ChangeLog?r1=1.60&r2=1.61 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v |
18 |
retrieving revision 1.60 |
19 |
retrieving revision 1.61 |
20 |
diff -u -r1.60 -r1.61 |
21 |
--- ChangeLog 28 Jan 2009 14:57:41 -0000 1.60 |
22 |
+++ ChangeLog 31 Jan 2009 14:34:36 -0000 1.61 |
23 |
@@ -1,6 +1,11 @@ |
24 |
# ChangeLog for sys-apps/openrc |
25 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.60 2009/01/28 14:57:41 zzam Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.61 2009/01/31 14:34:36 zzam Exp $ |
28 |
+ |
29 |
+ 31 Jan 2009; Matthias Schwarzott <zzam@g.o> openrc-0.4.2.ebuild, |
30 |
+ openrc-9999.ebuild: |
31 |
+ Sync 0.4.2 and 9999 ebuild. This does not change anything for 0.4.2 |
32 |
+ ebuild. |
33 |
|
34 |
28 Jan 2009; Matthias Schwarzott <zzam@g.o> openrc-9999.ebuild: |
35 |
Use specialized svnversion command to get commit version. |
36 |
|
37 |
|
38 |
|
39 |
1.45 sys-apps/openrc/openrc-9999.ebuild |
40 |
|
41 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.45&view=markup |
42 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.45&content-type=text/plain |
43 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.44&r2=1.45 |
44 |
|
45 |
Index: openrc-9999.ebuild |
46 |
=================================================================== |
47 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v |
48 |
retrieving revision 1.44 |
49 |
retrieving revision 1.45 |
50 |
diff -u -r1.44 -r1.45 |
51 |
--- openrc-9999.ebuild 28 Jan 2009 14:57:41 -0000 1.44 |
52 |
+++ openrc-9999.ebuild 31 Jan 2009 14:34:36 -0000 1.45 |
53 |
@@ -1,6 +1,6 @@ |
54 |
# Copyright 1999-2009 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.44 2009/01/28 14:57:41 zzam Exp $ |
57 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.45 2009/01/31 14:34:36 zzam Exp $ |
58 |
|
59 |
inherit eutils flag-o-matic multilib toolchain-funcs |
60 |
|
61 |
@@ -173,6 +173,9 @@ |
62 |
fi |
63 |
done |
64 |
|
65 |
+ # termencoding was added in 0.2.1 and needed in boot |
66 |
+ has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding |
67 |
+ |
68 |
# openrc-0.4.0 no longer loads the udev addon |
69 |
enable_udev=0 |
70 |
if [[ ! -e "${ROOT}"/etc/runlevels/sysinit/udev ]] && \ |
71 |
@@ -280,11 +283,13 @@ |
72 |
else |
73 |
if [[ ! -e ${ROOT}/etc/runlevels/sysinit/devfs ]] ; then |
74 |
mkdir -p "${ROOT}"/etc/runlevels/sysinit |
75 |
- cp -RPp "${ROOT}"/usr/share/${PN}/runlevels/sysinit/* "${ROOT}"/etc/runlevels/sysinit |
76 |
+ cp -RPp "${ROOT}"/usr/share/${PN}/runlevels/sysinit/* \ |
77 |
+ "${ROOT}"/etc/runlevels/sysinit |
78 |
fi |
79 |
if [[ ! -e ${ROOT}/etc/runlevels/shutdown/mount-ro ]] ; then |
80 |
mkdir -p "${ROOT}"/etc/runlevels/shutdown |
81 |
- cp -RPp "${ROOT}"/usr/share/${PN}/runlevels/shutdown/* "${ROOT}"/etc/runlevels/shutdown |
82 |
+ cp -RPp "${ROOT}"/usr/share/${PN}/runlevels/shutdown/* \ |
83 |
+ "${ROOT}"/etc/runlevels/shutdown |
84 |
fi |
85 |
fi |
86 |
|
87 |
|
88 |
|
89 |
|
90 |
1.2 sys-apps/openrc/openrc-0.4.2.ebuild |
91 |
|
92 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-0.4.2.ebuild?rev=1.2&view=markup |
93 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-0.4.2.ebuild?rev=1.2&content-type=text/plain |
94 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-0.4.2.ebuild?r1=1.1&r2=1.2 |
95 |
|
96 |
Index: openrc-0.4.2.ebuild |
97 |
=================================================================== |
98 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.4.2.ebuild,v |
99 |
retrieving revision 1.1 |
100 |
retrieving revision 1.2 |
101 |
diff -u -r1.1 -r1.2 |
102 |
--- openrc-0.4.2.ebuild 14 Jan 2009 14:19:47 -0000 1.1 |
103 |
+++ openrc-0.4.2.ebuild 31 Jan 2009 14:34:36 -0000 1.2 |
104 |
@@ -1,13 +1,12 @@ |
105 |
# Copyright 1999-2009 Gentoo Foundation |
106 |
# Distributed under the terms of the GNU General Public License v2 |
107 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.4.2.ebuild,v 1.1 2009/01/14 14:19:47 zzam Exp $ |
108 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.4.2.ebuild,v 1.2 2009/01/31 14:34:36 zzam Exp $ |
109 |
|
110 |
inherit eutils flag-o-matic multilib toolchain-funcs |
111 |
|
112 |
if [[ ${PV} == "9999" ]] ; then |
113 |
- EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/openrc.git" |
114 |
- EGIT_BRANCH="master" |
115 |
- inherit git |
116 |
+ ESVN_REPO_URI="svn://roy.marples.name/openrc/trunk" |
117 |
+ inherit subversion |
118 |
else |
119 |
SRC_URI="http://roy.marples.name/downloads/${PN}/${P}.tar.bz2 |
120 |
mirror://gentoo/${P}.tar.bz2 |
121 |
@@ -58,7 +57,7 @@ |
122 |
|
123 |
src_unpack() { |
124 |
if [[ ${PV} == "9999" ]] ; then |
125 |
- git_src_unpack |
126 |
+ subversion_src_unpack |
127 |
else |
128 |
unpack ${A} |
129 |
fi |
130 |
@@ -73,8 +72,8 @@ |
131 |
fi |
132 |
|
133 |
if [[ ${PV} == "9999" ]] ; then |
134 |
- local ver="git-$(git --git-dir=${EGIT_STORE_DIR}/${EGIT_PROJECT} rev-parse --verify ${EGIT_BRANCH} | cut -c1-8)" |
135 |
- sed -i "/^VERSION[[:space:]]*=/s:=.*:=${ver}:" Makefile |
136 |
+ local ver="-svn-$(cd "${ESVN_STORE_DIR}/${ESVN_PROJECT}/${ESVN_REPO_URI##*/}"; LC_ALL=C svnversion)" |
137 |
+ sed -i "/^SVNVER[[:space:]]*=/s:=.*:=${ver}:" src/rc/Makefile |
138 |
fi |
139 |
|
140 |
tc-export CC AR RANLIB |