1 |
vapier 08/02/10 10:15:03 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: e2fsprogs-1.40.6.ebuild |
5 |
Log: |
6 |
Version bump. |
7 |
(Portage version: 2.1.4.1) |
8 |
|
9 |
Revision Changes Path |
10 |
1.135 sys-fs/e2fsprogs/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/e2fsprogs/ChangeLog?rev=1.135&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/e2fsprogs/ChangeLog?rev=1.135&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/e2fsprogs/ChangeLog?r1=1.134&r2=1.135 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v |
19 |
retrieving revision 1.134 |
20 |
retrieving revision 1.135 |
21 |
diff -u -r1.134 -r1.135 |
22 |
--- ChangeLog 3 Feb 2008 15:50:23 -0000 1.134 |
23 |
+++ ChangeLog 10 Feb 2008 10:15:02 -0000 1.135 |
24 |
@@ -1,6 +1,11 @@ |
25 |
# ChangeLog for sys-fs/e2fsprogs |
26 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.134 2008/02/03 15:50:23 angelos Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.135 2008/02/10 10:15:02 vapier Exp $ |
29 |
+ |
30 |
+*e2fsprogs-1.40.6 (10 Feb 2008) |
31 |
+ |
32 |
+ 10 Feb 2008; Mike Frysinger <vapier@g.o> +e2fsprogs-1.40.6.ebuild: |
33 |
+ Version bump. |
34 |
|
35 |
03 Feb 2008; Christoph Mende <angelos@g.o> e2fsprogs-1.40.4.ebuild: |
36 |
Stable on amd64, bug #207841 |
37 |
|
38 |
|
39 |
|
40 |
1.1 sys-fs/e2fsprogs/e2fsprogs-1.40.6.ebuild |
41 |
|
42 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.40.6.ebuild?rev=1.1&view=markup |
43 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.40.6.ebuild?rev=1.1&content-type=text/plain |
44 |
|
45 |
Index: e2fsprogs-1.40.6.ebuild |
46 |
=================================================================== |
47 |
# Copyright 1999-2008 Gentoo Foundation |
48 |
# Distributed under the terms of the GNU General Public License v2 |
49 |
# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.40.6.ebuild,v 1.1 2008/02/10 10:15:02 vapier Exp $ |
50 |
|
51 |
inherit eutils flag-o-matic toolchain-funcs multilib |
52 |
|
53 |
DESCRIPTION="Standard EXT2 and EXT3 filesystem utilities" |
54 |
HOMEPAGE="http://e2fsprogs.sourceforge.net/" |
55 |
SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.gz" |
56 |
|
57 |
LICENSE="GPL-2 BSD" |
58 |
SLOT="0" |
59 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" |
60 |
IUSE="nls static elibc_FreeBSD" |
61 |
|
62 |
RDEPEND="~sys-libs/com_err-${PV} |
63 |
~sys-libs/ss-${PV} |
64 |
nls? ( virtual/libintl )" |
65 |
DEPEND="${RDEPEND} |
66 |
nls? ( sys-devel/gettext ) |
67 |
sys-apps/texinfo" |
68 |
|
69 |
src_unpack() { |
70 |
unpack ${A} |
71 |
cd "${S}" |
72 |
epatch "${FILESDIR}"/${PN}-1.38-tests-locale.patch #99766 |
73 |
chmod u+w po/*.po # Userpriv fix #27348 |
74 |
# Clean up makefile to suck less |
75 |
epatch "${FILESDIR}"/e2fsprogs-1.39-makefile.patch |
76 |
epatch "${FILESDIR}"/${PN}-1.40.5-libintl.patch #122368 |
77 |
epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch |
78 |
|
79 |
# kernel headers use the same defines as e2fsprogs and can cause issues #48829 |
80 |
sed -i \ |
81 |
-e 's:CONFIG_JBD_DEBUG:__CONFIG_JBD_DEBUG__E2FS:g' \ |
82 |
$(grep -rl CONFIG_JBD_DEBUG *) \ |
83 |
|| die "sed jbd debug failed" |
84 |
|
85 |
# fake out files we forked into sep packages |
86 |
sed -i \ |
87 |
-e '/^LIB_SUBDIRS/s:lib/et::' \ |
88 |
-e '/^LIB_SUBDIRS/s:lib/ss::' \ |
89 |
Makefile.in || die "remove subdirs" |
90 |
|
91 |
# since we've split out com_err/ss into their own ebuilds, we |
92 |
# need to fake out the local files. let the toolchain find them. |
93 |
echo "GROUP ( /usr/$(get_libdir)/libcom_err.a )" > lib/libcom_err.a |
94 |
echo "GROUP ( /usr/$(get_libdir)/libcom_err.so )" > lib/libcom_err.so |
95 |
echo "GROUP ( /usr/$(get_libdir)/libss.a )" > lib/libss.a |
96 |
echo "GROUP ( /usr/$(get_libdir)/libss.so )" > lib/libss.so |
97 |
echo '#include_next <ss/ss_err.h>' > lib/ss/ss_err.h |
98 |
ln -s /usr/bin/mk_cmds lib/ss/mk_cmds |
99 |
|
100 |
# sanity check for Bug 105304 |
101 |
if [[ -z ${USERLAND} ]] ; then |
102 |
eerror "You just hit Bug 105304, please post your 'emerge info' here:" |
103 |
eerror "http://bugs.gentoo.org/105304" |
104 |
die "Aborting to prevent screwing your system" |
105 |
fi |
106 |
} |
107 |
|
108 |
src_compile() { |
109 |
# Keep the package from doing silly things |
110 |
export LDCONFIG=: |
111 |
export CC=$(tc-getCC) |
112 |
export STRIP=: |
113 |
|
114 |
econf \ |
115 |
--bindir=/bin \ |
116 |
--sbindir=/sbin \ |
117 |
--enable-elf-shlibs \ |
118 |
--with-ldopts="${LDFLAGS}" \ |
119 |
$(use_enable !static dynamic-e2fsck) \ |
120 |
--without-included-gettext \ |
121 |
$(use_enable nls) \ |
122 |
$(use_enable userland_GNU fsck) \ |
123 |
|| die |
124 |
if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then |
125 |
eerror "INTL sanity check failed, aborting build." |
126 |
eerror "Please post your ${S}/config.log file as an" |
127 |
eerror "attachment to http://bugs.gentoo.org/show_bug.cgi?id=81096" |
128 |
die "Preventing included intl cruft from building" |
129 |
fi |
130 |
# Parallel make sometimes fails |
131 |
emake -j1 COMPILE_ET=compile_et || die |
132 |
|
133 |
# Build the FreeBSD helper |
134 |
if use elibc_FreeBSD ; then |
135 |
cp "${FILESDIR}"/fsck_ext2fs.c . |
136 |
emake fsck_ext2fs || die |
137 |
fi |
138 |
} |
139 |
|
140 |
src_install() { |
141 |
emake DESTDIR="${D}" install || die |
142 |
dodoc README RELEASE-NOTES |
143 |
|
144 |
# Move shared libraries to /lib/, install static libraries to /usr/lib/, |
145 |
# and install linker scripts to /usr/lib/. |
146 |
dodir /$(get_libdir) |
147 |
mv "${D}"/usr/$(get_libdir)/*.so* "${D}"/$(get_libdir)/ |
148 |
dolib.a lib/*.a || die "dolib.a" |
149 |
rm -f "${D}"/usr/$(get_libdir)/lib{com_err,ss}.a #125146 |
150 |
local x |
151 |
cd "${D}"/$(get_libdir) |
152 |
for x in *.so ; do |
153 |
gen_usr_ldscript ${x} || die "gen ldscript ${x}" |
154 |
done |
155 |
|
156 |
# move 'useless' stuff to /usr/ |
157 |
dosbin "${D}"/sbin/mklost+found |
158 |
rm -f "${D}"/sbin/mklost+found |
159 |
|
160 |
if use elibc_FreeBSD ; then |
161 |
# Install helpers for us |
162 |
into / |
163 |
dosbin "${S}"/fsck_ext2fs || die |
164 |
doman "${FILESDIR}"/fsck_ext2fs.8 |
165 |
|
166 |
# these manpages are already provided by FreeBSD libc |
167 |
# and filefrag is linux only |
168 |
rm -f \ |
169 |
"${D}"/sbin/filefrag \ |
170 |
"${D}"/usr/share/man/man8/filefrag.8 \ |
171 |
"${D}"/bin/uuidgen \ |
172 |
"${D}"/usr/share/man/man3/{uuid,uuid_compare}.3 \ |
173 |
"${D}"/usr/share/man/man1/uuidgen.1 || die |
174 |
fi |
175 |
} |
176 |
|
177 |
|
178 |
|
179 |
-- |
180 |
gentoo-commits@l.g.o mailing list |