1 |
vapier 08/03/29 21:31:21 |
2 |
|
3 |
Modified: ChangeLog util-linux-9999.ebuild |
4 |
util-linux-2.13.1.ebuild |
5 |
Log: |
6 |
Add support for USE=unicode and USE=slang #208976. Update loop-aes cruft #206331. |
7 |
(Portage version: 2.2_pre5) |
8 |
|
9 |
Revision Changes Path |
10 |
1.226 sys-apps/util-linux/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/util-linux/ChangeLog?rev=1.226&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/util-linux/ChangeLog?rev=1.226&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/util-linux/ChangeLog?r1=1.225&r2=1.226 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v |
19 |
retrieving revision 1.225 |
20 |
retrieving revision 1.226 |
21 |
diff -u -r1.225 -r1.226 |
22 |
--- ChangeLog 26 Feb 2008 23:03:17 -0000 1.225 |
23 |
+++ ChangeLog 29 Mar 2008 21:31:21 -0000 1.226 |
24 |
@@ -1,6 +1,11 @@ |
25 |
# ChangeLog for sys-apps/util-linux |
26 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.225 2008/02/26 23:03:17 vapier Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.226 2008/03/29 21:31:21 vapier Exp $ |
29 |
+ |
30 |
+ 29 Mar 2008; Mike Frysinger <vapier@g.o> util-linux-2.13.1.ebuild, |
31 |
+ util-linux-9999.ebuild: |
32 |
+ Add support for USE=unicode and USE=slang #208976. Update loop-aes cruft |
33 |
+ #206331. |
34 |
|
35 |
26 Feb 2008; Mike Frysinger <vapier@g.o> util-linux-2.13.1.ebuild: |
36 |
Add ioprio workaround back as it hasnt been properly fixed in this release |
37 |
|
38 |
|
39 |
|
40 |
1.6 sys-apps/util-linux/util-linux-9999.ebuild |
41 |
|
42 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/util-linux/util-linux-9999.ebuild?rev=1.6&view=markup |
43 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/util-linux/util-linux-9999.ebuild?rev=1.6&content-type=text/plain |
44 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/util-linux/util-linux-9999.ebuild?r1=1.5&r2=1.6 |
45 |
|
46 |
Index: util-linux-9999.ebuild |
47 |
=================================================================== |
48 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-9999.ebuild,v |
49 |
retrieving revision 1.5 |
50 |
retrieving revision 1.6 |
51 |
diff -u -r1.5 -r1.6 |
52 |
--- util-linux-9999.ebuild 28 Aug 2007 14:03:09 -0000 1.5 |
53 |
+++ util-linux-9999.ebuild 29 Mar 2008 21:31:21 -0000 1.6 |
54 |
@@ -1,6 +1,6 @@ |
55 |
-# Copyright 1999-2007 Gentoo Foundation |
56 |
+# Copyright 1999-2008 Gentoo Foundation |
57 |
# Distributed under the terms of the GNU General Public License v2 |
58 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-9999.ebuild,v 1.5 2007/08/28 14:03:09 vapier Exp $ |
59 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-9999.ebuild,v 1.6 2008/03/29 21:31:21 vapier Exp $ |
60 |
|
61 |
EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux-ng/util-linux-ng.git" |
62 |
inherit eutils |
63 |
@@ -15,19 +15,21 @@ |
64 |
if [[ ${PV} == "9999" ]] ; then |
65 |
SRC_URI="" |
66 |
else |
67 |
- SRC_URI="http://www.kernel.org/pub/linux/utils/util-linux-ng/v${PV:0:4}/${MY_P}.tar.bz2" |
68 |
+ SRC_URI="http://www.kernel.org/pub/linux/utils/util-linux-ng/v${PV:0:4}/${MY_P}.tar.bz2 |
69 |
+ loop-aes? ( http://loop-aes.sourceforge.net/loop-AES/loop-AES-v3.2c.tar.bz2 )" |
70 |
fi |
71 |
|
72 |
LICENSE="GPL-2" |
73 |
SLOT="0" |
74 |
KEYWORDS="" |
75 |
-IUSE="nls old-linux selinux" |
76 |
+IUSE="crypt loop-aes nls old-linux selinux slang unicode" |
77 |
|
78 |
RDEPEND="!sys-process/schedutils |
79 |
!sys-apps/setarch |
80 |
>=sys-libs/ncurses-5.2-r2 |
81 |
>=sys-fs/e2fsprogs-1.34 |
82 |
- selinux? ( sys-libs/libselinux )" |
83 |
+ selinux? ( sys-libs/libselinux ) |
84 |
+ slang? ( sys-libs/slang )" |
85 |
DEPEND="${RDEPEND} |
86 |
nls? ( sys-devel/gettext ) |
87 |
virtual/os-headers" |
88 |
@@ -39,6 +41,7 @@ |
89 |
./autogen.sh || die |
90 |
else |
91 |
unpack ${A} |
92 |
+ use loop-aes && epatch "${WORKDIR}"/loop-AES-*/util-linux-ng-*.diff |
93 |
fi |
94 |
} |
95 |
|
96 |
@@ -63,7 +66,9 @@ |
97 |
--disable-wall \ |
98 |
--enable-write \ |
99 |
--without-pam \ |
100 |
+ $(use unicode || echo --with-ncurses) \ |
101 |
$(use_with selinux) \ |
102 |
+ $(use_with slang) \ |
103 |
|| die "configure failed" |
104 |
emake || die "emake failed" |
105 |
} |
106 |
@@ -71,4 +76,9 @@ |
107 |
src_install() { |
108 |
emake install DESTDIR="${D}" || die "install failed" |
109 |
dodoc AUTHORS NEWS README* TODO docs/* |
110 |
+ |
111 |
+ if use crypt ; then |
112 |
+ newinitd "${FILESDIR}"/crypto-loop.initd crypto-loop || die |
113 |
+ newconfd "${FILESDIR}"/crypto-loop.confd crypto-loop || die |
114 |
+ fi |
115 |
} |
116 |
|
117 |
|
118 |
|
119 |
1.4 sys-apps/util-linux/util-linux-2.13.1.ebuild |
120 |
|
121 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/util-linux/util-linux-2.13.1.ebuild?rev=1.4&view=markup |
122 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/util-linux/util-linux-2.13.1.ebuild?rev=1.4&content-type=text/plain |
123 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/util-linux/util-linux-2.13.1.ebuild?r1=1.3&r2=1.4 |
124 |
|
125 |
Index: util-linux-2.13.1.ebuild |
126 |
=================================================================== |
127 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.13.1.ebuild,v |
128 |
retrieving revision 1.3 |
129 |
retrieving revision 1.4 |
130 |
diff -u -r1.3 -r1.4 |
131 |
--- util-linux-2.13.1.ebuild 26 Feb 2008 23:03:17 -0000 1.3 |
132 |
+++ util-linux-2.13.1.ebuild 29 Mar 2008 21:31:21 -0000 1.4 |
133 |
@@ -1,6 +1,6 @@ |
134 |
# Copyright 1999-2008 Gentoo Foundation |
135 |
# Distributed under the terms of the GNU General Public License v2 |
136 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.13.1.ebuild,v 1.3 2008/02/26 23:03:17 vapier Exp $ |
137 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.13.1.ebuild,v 1.4 2008/03/29 21:31:21 vapier Exp $ |
138 |
|
139 |
EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux-ng/util-linux-ng.git" |
140 |
inherit eutils |
141 |
@@ -16,19 +16,20 @@ |
142 |
SRC_URI="" |
143 |
else |
144 |
SRC_URI="http://www.kernel.org/pub/linux/utils/util-linux-ng/v${PV:0:4}/${MY_P}.tar.bz2 |
145 |
- loop-aes? ( http://loop-aes.sourceforge.net/loop-AES/loop-AES-v3.2b.tar.bz2 )" |
146 |
+ loop-aes? ( http://loop-aes.sourceforge.net/loop-AES/loop-AES-v3.2c.tar.bz2 )" |
147 |
fi |
148 |
|
149 |
LICENSE="GPL-2" |
150 |
SLOT="0" |
151 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
152 |
-IUSE="crypt loop-aes nls old-linux selinux" |
153 |
+IUSE="crypt loop-aes nls old-linux selinux slang unicode" |
154 |
|
155 |
RDEPEND="!sys-process/schedutils |
156 |
!sys-apps/setarch |
157 |
>=sys-libs/ncurses-5.2-r2 |
158 |
>=sys-fs/e2fsprogs-1.34 |
159 |
- selinux? ( sys-libs/libselinux )" |
160 |
+ selinux? ( sys-libs/libselinux ) |
161 |
+ slang? ( sys-libs/slang )" |
162 |
DEPEND="${RDEPEND} |
163 |
nls? ( sys-devel/gettext ) |
164 |
virtual/os-headers" |
165 |
@@ -42,7 +43,8 @@ |
166 |
unpack ${A} |
167 |
cd "${S}" |
168 |
epatch "${FILESDIR}"/${PN}-2.13-uclibc.patch #203711 |
169 |
- use loop-aes && epatch "${WORKDIR}"/loop-AES-*/util-linux-ng-2.13.0.1.diff |
170 |
+ use loop-aes && epatch "${WORKDIR}"/loop-AES-*/util-linux-ng-*.diff |
171 |
+ use unicode && sed -i 's:-lncurses:-lncursesw:' */Makefile.in #208976 |
172 |
epatch "${FILESDIR}"/${PN}-2.13-ioprio-syscalls.patch #190613 |
173 |
fi |
174 |
} |
175 |
@@ -69,6 +71,7 @@ |
176 |
--enable-write \ |
177 |
--without-pam \ |
178 |
$(use_with selinux) \ |
179 |
+ $(use_with slang) \ |
180 |
|| die "configure failed" |
181 |
emake || die "emake failed" |
182 |
} |
183 |
|
184 |
|
185 |
|
186 |
-- |
187 |
gentoo-commits@l.g.o mailing list |