Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-9999.ebuild openrc-0.2-r1.ebuild ChangeLog
Date: Fri, 28 Mar 2008 16:57:38
Message-Id: E1JfHtX-0001jd-Qo@stork.gentoo.org
1 vapier 08/03/28 16:57:35
2
3 Modified: openrc-9999.ebuild openrc-0.2-r1.ebuild ChangeLog
4 Log:
5 Drop USE=static since it doesnt really result in static.
6 (Portage version: 2.2_pre5)
7
8 Revision Changes Path
9 1.14 sys-apps/openrc/openrc-9999.ebuild
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.14&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.14&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.13&r2=1.14
14
15 Index: openrc-9999.ebuild
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
18 retrieving revision 1.13
19 retrieving revision 1.14
20 diff -u -r1.13 -r1.14
21 --- openrc-9999.ebuild 26 Mar 2008 20:12:15 -0000 1.13
22 +++ openrc-9999.ebuild 28 Mar 2008 16:57:35 -0000 1.14
23 @@ -1,6 +1,6 @@
24 # Copyright 1999-2008 Gentoo Foundation
25 # Distributed under the terms of the GNU General Public License v2
26 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.13 2008/03/26 20:12:15 cardoe Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.14 2008/03/28 16:57:35 vapier Exp $
28
29 inherit eutils flag-o-matic multilib toolchain-funcs
30
31 @@ -21,7 +21,7 @@
32 LICENSE="BSD-2"
33 SLOT="0"
34 KEYWORDS="" #"~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
35 -IUSE="debug ncurses pam static unicode kernel_linux kernel_FreeBSD"
36 +IUSE="debug ncurses pam unicode kernel_linux kernel_FreeBSD"
37
38 RDEPEND="virtual/init
39 kernel_linux? ( >=sys-apps/module-init-tools-3.2.2-r2 )
40 @@ -44,20 +44,23 @@
41 MAKE_ARGS="${MAKE_ARGS} OS=Linux"
42 brand="Linux"
43 elif use kernel_FreeBSD ; then
44 - MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD SUBOS=BSD"
45 + MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
46 brand="FreeBSD"
47 fi
48 export BRANDING="Gentoo ${brand}"
49
50 - export PROGLDFLAGS=$(use static && echo -static)
51 export DEBUG=$(usev debug)
52 - export MKPAM=$(use static || usev pam)
53 + export MKPAM=$(usev pam)
54 export MKTERMCAP=$(usev ncurses)
55 +}
56
57 - if use pam && use static ; then
58 - ewarn "OpenRC cannot be built statically with PAM support,"
59 - ewarn "so PAM support has been disabled."
60 +src_unpack() {
61 + if [[ ${PV} == "9999" ]] ; then
62 + git_src_unpack
63 + else
64 + unpack ${A}
65 fi
66 + cd "${S}"
67 }
68
69 src_compile() {
70
71
72
73 1.7 sys-apps/openrc/openrc-0.2-r1.ebuild
74
75 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-0.2-r1.ebuild?rev=1.7&view=markup
76 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-0.2-r1.ebuild?rev=1.7&content-type=text/plain
77 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-0.2-r1.ebuild?r1=1.6&r2=1.7
78
79 Index: openrc-0.2-r1.ebuild
80 ===================================================================
81 RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.2-r1.ebuild,v
82 retrieving revision 1.6
83 retrieving revision 1.7
84 diff -u -r1.6 -r1.7
85 --- openrc-0.2-r1.ebuild 28 Mar 2008 16:07:40 -0000 1.6
86 +++ openrc-0.2-r1.ebuild 28 Mar 2008 16:57:35 -0000 1.7
87 @@ -1,6 +1,6 @@
88 # Copyright 1999-2008 Gentoo Foundation
89 # Distributed under the terms of the GNU General Public License v2
90 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.2-r1.ebuild,v 1.6 2008/03/28 16:07:40 aballier Exp $
91 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.2-r1.ebuild,v 1.7 2008/03/28 16:57:35 vapier Exp $
92
93 inherit eutils flag-o-matic multilib toolchain-funcs
94
95 @@ -21,7 +21,7 @@
96 LICENSE="BSD-2"
97 SLOT="0"
98 KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc-fbsd ~x86 ~x86-fbsd" #"~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
99 -IUSE="debug ncurses pam static unicode kernel_linux kernel_FreeBSD"
100 +IUSE="debug ncurses pam unicode kernel_linux kernel_FreeBSD"
101
102 RDEPEND="virtual/init
103 kernel_linux? ( >=sys-apps/module-init-tools-3.2.2-r2 )
104 @@ -33,8 +33,6 @@
105 DEPEND="${RDEPEND}
106 virtual/os-headers"
107
108 -#S="${WORKDIR}/${PN}-0.2"
109 -
110 pkg_setup() {
111 LIBDIR="lib"
112 [ "${SYMLINK_LIB}" = "yes" ] && LIBDIR=$(get_abi_LIBDIR "${DEFAULT_ABI}")
113 @@ -51,19 +49,17 @@
114 fi
115 export BRANDING="Gentoo ${brand}"
116
117 - export PROGLDFLAGS=$(use static && echo -static)
118 export DEBUG=$(usev debug)
119 - export MKPAM=$(use static || usev pam)
120 + export MKPAM=$(usev pam)
121 export MKTERMCAP=$(usev ncurses)
122 -
123 - if use pam && use static ; then
124 - ewarn "OpenRC cannot be built statically with PAM support,"
125 - ewarn "so PAM support has been disabled."
126 - fi
127 }
128
129 src_unpack() {
130 - unpack ${A}
131 + if [[ ${PV} == "9999" ]] ; then
132 + git_src_unpack
133 + else
134 + unpack ${A}
135 + fi
136 cd "${S}"
137
138 epatch "${FILESDIR}"/${PN}-0.2-freebsd-install-rc.patch
139
140
141
142 1.12 sys-apps/openrc/ChangeLog
143
144 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.12&view=markup
145 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.12&content-type=text/plain
146 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/ChangeLog?r1=1.11&r2=1.12
147
148 Index: ChangeLog
149 ===================================================================
150 RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v
151 retrieving revision 1.11
152 retrieving revision 1.12
153 diff -u -r1.11 -r1.12
154 --- ChangeLog 28 Mar 2008 16:07:40 -0000 1.11
155 +++ ChangeLog 28 Mar 2008 16:57:35 -0000 1.12
156 @@ -1,6 +1,10 @@
157 # ChangeLog for sys-apps/openrc
158 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
159 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.11 2008/03/28 16:07:40 aballier Exp $
160 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.12 2008/03/28 16:57:35 vapier Exp $
161 +
162 + 28 Mar 2008; Mike Frysinger <vapier@g.o> openrc-0.2-r1.ebuild,
163 + openrc-9999.ebuild:
164 + Drop USE=static since it doesnt really result in static.
165
166 28 Mar 2008; Alexis Ballier <aballier@g.o> openrc-0.2-r1.ebuild:
167 keyword ~x86-fbsd
168
169
170
171 --
172 gentoo-commits@l.g.o mailing list
Report Message
Find on MARC Find on Google Groups