1 |
polynomial-c 14/05/28 10:40:20 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: e2fsprogs-1.42.10.ebuild |
5 |
Removed: e2fsprogs-1.42.8.ebuild |
6 |
Log: |
7 |
Version bump. Removed old |
8 |
|
9 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC) |
10 |
|
11 |
Revision Changes Path |
12 |
1.275 sys-fs/e2fsprogs/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/e2fsprogs/ChangeLog?rev=1.275&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/e2fsprogs/ChangeLog?rev=1.275&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/e2fsprogs/ChangeLog?r1=1.274&r2=1.275 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v |
21 |
retrieving revision 1.274 |
22 |
retrieving revision 1.275 |
23 |
diff -u -r1.274 -r1.275 |
24 |
--- ChangeLog 18 Jan 2014 05:15:33 -0000 1.274 |
25 |
+++ ChangeLog 28 May 2014 10:40:20 -0000 1.275 |
26 |
@@ -1,6 +1,12 @@ |
27 |
# ChangeLog for sys-fs/e2fsprogs |
28 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.274 2014/01/18 05:15:33 vapier Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.275 2014/05/28 10:40:20 polynomial-c Exp $ |
31 |
+ |
32 |
+*e2fsprogs-1.42.10 (28 May 2014) |
33 |
+ |
34 |
+ 28 May 2014; Lars Wendler <polynomial-c@g.o> -e2fsprogs-1.42.8.ebuild, |
35 |
+ +e2fsprogs-1.42.10.ebuild: |
36 |
+ Version bump. Removed old. |
37 |
|
38 |
18 Jan 2014; Mike Frysinger <vapier@g.o> e2fsprogs-1.42.7.ebuild, |
39 |
e2fsprogs-1.42.8.ebuild, e2fsprogs-1.42.9.ebuild: |
40 |
|
41 |
|
42 |
|
43 |
1.1 sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild?rev=1.1&view=markup |
46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild?rev=1.1&content-type=text/plain |
47 |
|
48 |
Index: e2fsprogs-1.42.10.ebuild |
49 |
=================================================================== |
50 |
# Copyright 1999-2014 Gentoo Foundation |
51 |
# Distributed under the terms of the GNU General Public License v2 |
52 |
# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild,v 1.1 2014/05/28 10:40:20 polynomial-c Exp $ |
53 |
|
54 |
EAPI=4 |
55 |
|
56 |
case ${PV} in |
57 |
*_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;; |
58 |
*) UP_PV=${PV} ;; |
59 |
esac |
60 |
|
61 |
inherit eutils flag-o-matic multilib toolchain-funcs |
62 |
|
63 |
DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities" |
64 |
HOMEPAGE="http://e2fsprogs.sourceforge.net/" |
65 |
SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz" |
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 ~ppc-macos ~x86-macos ~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 |
pkg_setup() { |
83 |
if [[ ! -e ${EROOT}/etc/mtab ]] ; then |
84 |
# add some crap to deal with missing /etc/mtab #217719 |
85 |
ewarn "No /etc/mtab file, creating one temporarily" |
86 |
echo "${PN} crap for src_test" > "${EROOT}"/etc/mtab |
87 |
fi |
88 |
} |
89 |
|
90 |
src_prepare() { |
91 |
epatch "${FILESDIR}"/${PN}-1.41.8-makefile.patch |
92 |
epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch |
93 |
epatch "${FILESDIR}"/${PN}-1.41.12-darwin-makefile.patch |
94 |
if [[ ${CHOST} == *-mint* ]] ; then |
95 |
epatch "${FILESDIR}"/${PN}-1.41-mint.patch |
96 |
epatch "${FILESDIR}"/${PN}-1.41.12-mint-blkid.patch |
97 |
fi |
98 |
# blargh ... trick e2fsprogs into using e2fsprogs-libs |
99 |
rm -rf doc |
100 |
sed -i -r \ |
101 |
-e 's:@LIBINTL@:@LTLIBINTL@:' \ |
102 |
-e '/^LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@LIB_EXT@:-l\1:' \ |
103 |
-e '/^DEPLIB(COM_ERR|SS)/s:=.*:=:' \ |
104 |
MCONFIG.in || die "muck libs" #122368 |
105 |
sed -i -r \ |
106 |
-e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \ |
107 |
Makefile.in || die "remove subdirs" |
108 |
|
109 |
# Avoid rebuild |
110 |
touch lib/ss/ss_err.h |
111 |
} |
112 |
|
113 |
src_configure() { |
114 |
# Keep the package from doing silly things #261411 |
115 |
export VARTEXFONTS=${T}/fonts |
116 |
|
117 |
# needs open64() prototypes and friends |
118 |
append-cppflags -D_GNU_SOURCE |
119 |
|
120 |
# We want to use the "bsd" libraries while building on Darwin, but while |
121 |
# building on other Gentoo/*BSD we prefer elf-naming scheme. |
122 |
local libtype |
123 |
case ${CHOST} in |
124 |
*-darwin*) libtype=--enable-bsd-shlibs ;; |
125 |
*-mint*) libtype= ;; |
126 |
*) libtype=--enable-elf-shlibs ;; |
127 |
esac |
128 |
|
129 |
ac_cv_path_LDCONFIG=: \ |
130 |
econf \ |
131 |
--with-root-prefix="${EPREFIX}/" \ |
132 |
--enable-symlink-install \ |
133 |
${libtype} \ |
134 |
$(tc-has-tls || echo --disable-tls) \ |
135 |
--without-included-gettext \ |
136 |
$(use_enable nls) \ |
137 |
--disable-libblkid \ |
138 |
--disable-libuuid \ |
139 |
--disable-quota \ |
140 |
--disable-fsck \ |
141 |
--disable-uuidd |
142 |
if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then |
143 |
eerror "INTL sanity check failed, aborting build." |
144 |
eerror "Please post your ${S}/config.log file as an" |
145 |
eerror "attachment to http://bugs.gentoo.org/show_bug.cgi?id=81096" |
146 |
die "Preventing included intl cruft from building" |
147 |
fi |
148 |
} |
149 |
|
150 |
src_compile() { |
151 |
emake COMPILE_ET=compile_et MK_CMDS=mk_cmds |
152 |
|
153 |
# Build the FreeBSD helper |
154 |
if use elibc_FreeBSD ; then |
155 |
cp "${FILESDIR}"/fsck_ext2fs.c . |
156 |
emake fsck_ext2fs |
157 |
fi |
158 |
} |
159 |
|
160 |
pkg_preinst() { |
161 |
if [[ -r ${EROOT}/etc/mtab ]] ; then |
162 |
if [[ $(<"${EROOT}"/etc/mtab) == "${PN} crap for src_test" ]] ; then |
163 |
rm -f "${EROOT}"/etc/mtab |
164 |
fi |
165 |
fi |
166 |
} |
167 |
|
168 |
src_install() { |
169 |
# need to set root_libdir= manually as any --libdir options in the |
170 |
# econf above (i.e. multilib) will screw up the default #276465 |
171 |
emake \ |
172 |
STRIP=: \ |
173 |
root_libdir="${EPREFIX}/usr/$(get_libdir)" \ |
174 |
DESTDIR="${D}" \ |
175 |
install install-libs |
176 |
dodoc README RELEASE-NOTES |
177 |
|
178 |
insinto /etc |
179 |
doins "${FILESDIR}"/e2fsck.conf |
180 |
|
181 |
# Move shared libraries to /lib/, install static libraries to |
182 |
# /usr/lib/, and install linker scripts to /usr/lib/. |
183 |
gen_usr_ldscript -a e2p ext2fs |
184 |
# configure doesn't have an option to disable static libs :/ |
185 |
use static-libs || find "${D}" -name '*.a' -delete |
186 |
|
187 |
if use elibc_FreeBSD ; then |
188 |
# Install helpers for us |
189 |
into / |
190 |
dosbin "${S}"/fsck_ext2fs |
191 |
doman "${FILESDIR}"/fsck_ext2fs.8 |
192 |
|
193 |
# filefrag is linux only |
194 |
rm \ |
195 |
"${ED}"/usr/sbin/filefrag \ |
196 |
"${ED}"/usr/share/man/man8/filefrag.8 || die |
197 |
fi |
198 |
} |