1 |
polynomial-c 14/09/05 18:40:53 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: e2fsprogs-1.42.12.ebuild |
5 |
Log: |
6 |
Version bump |
7 |
|
8 |
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC) |
9 |
|
10 |
Revision Changes Path |
11 |
1.296 sys-fs/e2fsprogs/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/e2fsprogs/ChangeLog?rev=1.296&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/e2fsprogs/ChangeLog?rev=1.296&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/e2fsprogs/ChangeLog?r1=1.295&r2=1.296 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v |
20 |
retrieving revision 1.295 |
21 |
retrieving revision 1.296 |
22 |
diff -u -r1.295 -r1.296 |
23 |
--- ChangeLog 23 Aug 2014 15:33:58 -0000 1.295 |
24 |
+++ ChangeLog 5 Sep 2014 18:40:53 -0000 1.296 |
25 |
@@ -1,6 +1,12 @@ |
26 |
# ChangeLog for sys-fs/e2fsprogs |
27 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.295 2014/08/23 15:33:58 ago Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.296 2014/09/05 18:40:53 polynomial-c Exp $ |
30 |
+ |
31 |
+*e2fsprogs-1.42.12 (05 Sep 2014) |
32 |
+ |
33 |
+ 05 Sep 2014; Lars Wendler <polynomial-c@g.o> |
34 |
+ +e2fsprogs-1.42.12.ebuild: |
35 |
+ Version bump. |
36 |
|
37 |
23 Aug 2014; Agostino Sarubbo <ago@g.o> e2fsprogs-1.42.10.ebuild: |
38 |
Stable for ia64, wrt bug #512012 |
39 |
|
40 |
|
41 |
|
42 |
1.1 sys-fs/e2fsprogs/e2fsprogs-1.42.12.ebuild |
43 |
|
44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.12.ebuild?rev=1.1&view=markup |
45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.12.ebuild?rev=1.1&content-type=text/plain |
46 |
|
47 |
Index: e2fsprogs-1.42.12.ebuild |
48 |
=================================================================== |
49 |
# Copyright 1999-2014 Gentoo Foundation |
50 |
# Distributed under the terms of the GNU General Public License v2 |
51 |
# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.12.ebuild,v 1.1 2014/09/05 18:40:53 polynomial-c Exp $ |
52 |
|
53 |
EAPI=4 |
54 |
|
55 |
case ${PV} in |
56 |
*_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;; |
57 |
*) UP_PV=${PV} ;; |
58 |
esac |
59 |
|
60 |
inherit autotools eutils flag-o-matic multilib toolchain-funcs |
61 |
|
62 |
DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities" |
63 |
HOMEPAGE="http://e2fsprogs.sourceforge.net/" |
64 |
SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz |
65 |
elibc_mintlib? ( mirror://gentoo/${PN}-1.42.9-mint-r1.patch.xz )" |
66 |
|
67 |
LICENSE="GPL-2 BSD" |
68 |
SLOT="0" |
69 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint" |
70 |
IUSE="nls static-libs elibc_FreeBSD" |
71 |
|
72 |
RDEPEND="~sys-libs/${PN}-libs-${PV} |
73 |
>=sys-apps/util-linux-2.16 |
74 |
nls? ( virtual/libintl )" |
75 |
DEPEND="${RDEPEND} |
76 |
nls? ( sys-devel/gettext ) |
77 |
virtual/pkgconfig |
78 |
sys-apps/texinfo" |
79 |
|
80 |
S=${WORKDIR}/${P%_pre*} |
81 |
|
82 |
src_prepare() { |
83 |
epatch "${FILESDIR}"/${PN}-1.41.8-makefile.patch |
84 |
epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch |
85 |
if [[ ${CHOST} == *-mint* ]] ; then |
86 |
epatch "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch |
87 |
fi |
88 |
epatch "${FILESDIR}"/${PN}-1.42.10-fix-build-cflags.patch |
89 |
|
90 |
# blargh ... trick e2fsprogs into using e2fsprogs-libs |
91 |
rm -rf doc |
92 |
sed -i -r \ |
93 |
-e 's:@LIBINTL@:@LTLIBINTL@:' \ |
94 |
-e '/^(STATIC_)?LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@(STATIC_)?LIB_EXT@:-l\1:' \ |
95 |
-e '/^DEP(STATIC_)?LIB(COM_ERR|SS)/s:=.*:=:' \ |
96 |
MCONFIG.in || die "muck libs" #122368 |
97 |
sed -i -r \ |
98 |
-e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \ |
99 |
Makefile.in || die "remove subdirs" |
100 |
ln -s $(which mk_cmds) lib/ss/ || die |
101 |
|
102 |
# Avoid rebuild |
103 |
echo '#include_next <ss/ss_err.h>' > lib/ss/ss_err.h |
104 |
eautoreconf |
105 |
} |
106 |
|
107 |
src_configure() { |
108 |
# Keep the package from doing silly things #261411 |
109 |
export VARTEXFONTS=${T}/fonts |
110 |
|
111 |
# needs open64() prototypes and friends |
112 |
append-cppflags -D_GNU_SOURCE |
113 |
|
114 |
ac_cv_path_LDCONFIG=: \ |
115 |
econf \ |
116 |
--with-root-prefix="${EPREFIX}/" \ |
117 |
--enable-symlink-install \ |
118 |
$(tc-is-static-only || echo --enable-elf-shlibs) \ |
119 |
$(tc-has-tls || echo --disable-tls) \ |
120 |
--without-included-gettext \ |
121 |
$(use_enable nls) \ |
122 |
--disable-libblkid \ |
123 |
--disable-libuuid \ |
124 |
--disable-quota \ |
125 |
--disable-fsck \ |
126 |
--disable-uuidd |
127 |
if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then |
128 |
eerror "INTL sanity check failed, aborting build." |
129 |
eerror "Please post your ${S}/config.log file as an" |
130 |
eerror "attachment to http://bugs.gentoo.org/show_bug.cgi?id=81096" |
131 |
die "Preventing included intl cruft from building" |
132 |
fi |
133 |
} |
134 |
|
135 |
src_compile() { |
136 |
emake V=1 COMPILE_ET=compile_et MK_CMDS=mk_cmds |
137 |
|
138 |
# Build the FreeBSD helper |
139 |
if use elibc_FreeBSD ; then |
140 |
cp "${FILESDIR}"/fsck_ext2fs.c . |
141 |
emake V=1 fsck_ext2fs |
142 |
fi |
143 |
} |
144 |
|
145 |
pkg_preinst() { |
146 |
if [[ -r ${EROOT}/etc/mtab ]] ; then |
147 |
if [[ $(<"${EROOT}"/etc/mtab) == "${PN} crap for src_test" ]] ; then |
148 |
rm -f "${EROOT}"/etc/mtab |
149 |
fi |
150 |
fi |
151 |
} |
152 |
|
153 |
src_install() { |
154 |
# need to set root_libdir= manually as any --libdir options in the |
155 |
# econf above (i.e. multilib) will screw up the default #276465 |
156 |
emake \ |
157 |
STRIP=: \ |
158 |
root_libdir="${EPREFIX}/usr/$(get_libdir)" \ |
159 |
DESTDIR="${D}" \ |
160 |
install install-libs |
161 |
dodoc README RELEASE-NOTES |
162 |
|
163 |
insinto /etc |
164 |
doins "${FILESDIR}"/e2fsck.conf |
165 |
|
166 |
# Move shared libraries to /lib/, install static libraries to |
167 |
# /usr/lib/, and install linker scripts to /usr/lib/. |
168 |
gen_usr_ldscript -a e2p ext2fs |
169 |
# configure doesn't have an option to disable static libs :/ |
170 |
use static-libs || find "${D}" -name '*.a' -delete |
171 |
|
172 |
if use elibc_FreeBSD ; then |
173 |
# Install helpers for us |
174 |
into / |
175 |
dosbin "${S}"/fsck_ext2fs |
176 |
doman "${FILESDIR}"/fsck_ext2fs.8 |
177 |
|
178 |
# filefrag is linux only |
179 |
rm \ |
180 |
"${ED}"/usr/sbin/filefrag \ |
181 |
"${ED}"/usr/share/man/man8/filefrag.8 || die |
182 |
fi |
183 |
} |