1 |
vapier 09/07/01 14:41:03 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: e2fsprogs-1.41.7.ebuild |
5 |
Log: |
6 |
Version bump. |
7 |
(Portage version: 2.2_rc33/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.190 sys-fs/e2fsprogs/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/e2fsprogs/ChangeLog?rev=1.190&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/e2fsprogs/ChangeLog?rev=1.190&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/e2fsprogs/ChangeLog?r1=1.189&r2=1.190 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v |
19 |
retrieving revision 1.189 |
20 |
retrieving revision 1.190 |
21 |
diff -u -r1.189 -r1.190 |
22 |
--- ChangeLog 28 Jun 2009 17:55:59 -0000 1.189 |
23 |
+++ ChangeLog 1 Jul 2009 14:41:03 -0000 1.190 |
24 |
@@ -1,6 +1,11 @@ |
25 |
# ChangeLog for sys-fs/e2fsprogs |
26 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.189 2009/06/28 17:55:59 robbat2 Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.190 2009/07/01 14:41:03 vapier Exp $ |
29 |
+ |
30 |
+*e2fsprogs-1.41.7 (01 Jul 2009) |
31 |
+ |
32 |
+ 01 Jul 2009; Mike Frysinger <vapier@g.o> +e2fsprogs-1.41.7.ebuild: |
33 |
+ Version bump. |
34 |
|
35 |
*e2fsprogs-1.41.6-r1 (28 Jun 2009) |
36 |
|
37 |
|
38 |
|
39 |
|
40 |
1.1 sys-fs/e2fsprogs/e2fsprogs-1.41.7.ebuild |
41 |
|
42 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.41.7.ebuild?rev=1.1&view=markup |
43 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.41.7.ebuild?rev=1.1&content-type=text/plain |
44 |
|
45 |
Index: e2fsprogs-1.41.7.ebuild |
46 |
=================================================================== |
47 |
# Copyright 1999-2009 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.41.7.ebuild,v 1.1 2009/07/01 14:41:03 vapier Exp $ |
50 |
|
51 |
inherit eutils flag-o-matic toolchain-funcs multilib |
52 |
|
53 |
DESCRIPTION="Standard EXT2/EXT3/EXT4 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 elibc_FreeBSD" |
61 |
|
62 |
RDEPEND="~sys-libs/${PN}-libs-${PV} |
63 |
nls? ( virtual/libintl )" |
64 |
DEPEND="${RDEPEND} |
65 |
nls? ( sys-devel/gettext ) |
66 |
dev-util/pkgconfig |
67 |
sys-apps/texinfo" |
68 |
|
69 |
pkg_setup() { |
70 |
if [[ ! -e ${ROOT}/etc/mtab ]] ; then |
71 |
# add some crap to deal with missing /etc/mtab #217719 |
72 |
ewarn "No /etc/mtab file, creating one temporarily" |
73 |
echo "${PN} crap for src_test" > "${ROOT}"/etc/mtab |
74 |
fi |
75 |
} |
76 |
|
77 |
src_unpack() { |
78 |
unpack ${A} |
79 |
cd "${S}" |
80 |
epatch "${FILESDIR}"/${PN}-1.38-tests-locale.patch #99766 |
81 |
epatch "${FILESDIR}"/${PN}-1.41.5-makefile.patch |
82 |
epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch |
83 |
# blargh ... trick e2fsprogs into using e2fsprogs-libs |
84 |
rm -rf doc |
85 |
sed -i -r \ |
86 |
-e 's:@LIBINTL@:@LTLIBINTL@:' \ |
87 |
-e '/^LIB(COM_ERR|SS|UUID)/s:[$][(]LIB[)]/lib([^@]*)@LIB_EXT@:-l\1:' \ |
88 |
-e '/^DEPLIB(COM_ERR|SS|UUID)/s:=.*:=:' \ |
89 |
MCONFIG.in || die "muck libs" #122368 |
90 |
sed -i -r \ |
91 |
-e '/^LIB_SUBDIRS/s:lib/(et|ss|uuid)::g' \ |
92 |
Makefile.in || die "remove subdirs" |
93 |
# stupid configure script clobbers CC for us |
94 |
sed -i \ |
95 |
-e '/if test -z "$CC" ; then CC=cc; fi/d' \ |
96 |
configure || die "touching configure" |
97 |
|
98 |
# we want to build the blkid/findfs binaries, but not the libs |
99 |
sed -i \ |
100 |
-e '/BLKID_CMT=/s:BLKID_CMT:LIBBLKID_CMT:g' \ |
101 |
configure || die "touching configure for blkid" |
102 |
sed -i \ |
103 |
-e '/BLKID_LIB_SUBDIR/s:@BLKID_CMT@:@LIBBLKID_CMT@:g' \ |
104 |
Makefile.in || die "remove blkid subdir better" |
105 |
|
106 |
# Avoid rebuild |
107 |
touch lib/ss/ss_err.h |
108 |
} |
109 |
|
110 |
src_compile() { |
111 |
# Keep the package from doing silly things |
112 |
addwrite /var/cache/fonts |
113 |
|
114 |
# We want to use the "bsd" libraries while building on Darwin, but while |
115 |
# building on other Gentoo/*BSD we prefer elf-naming scheme. |
116 |
local libtype |
117 |
case ${CHOST} in |
118 |
*-darwin*) libtype=bsd;; |
119 |
*) libtype=elf;; |
120 |
esac |
121 |
|
122 |
ac_cv_path_LDCONFIG=: \ |
123 |
econf \ |
124 |
--with-root-prefix=/ \ |
125 |
--enable-${libtype}-shlibs \ |
126 |
--with-ldopts="${LDFLAGS}" \ |
127 |
$(use_enable !elibc_uclibc tls) \ |
128 |
--without-included-gettext \ |
129 |
$(use_enable nls) \ |
130 |
$(use_enable userland_GNU fsck) \ |
131 |
--disable-libblkid \ |
132 |
--disable-libuuid \ |
133 |
|| die |
134 |
if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then |
135 |
eerror "INTL sanity check failed, aborting build." |
136 |
eerror "Please post your ${S}/config.log file as an" |
137 |
eerror "attachment to http://bugs.gentoo.org/show_bug.cgi?id=81096" |
138 |
die "Preventing included intl cruft from building" |
139 |
fi |
140 |
emake COMPILE_ET=compile_et MK_CMDS=mk_cmds || die |
141 |
|
142 |
# Build the FreeBSD helper |
143 |
if use elibc_FreeBSD ; then |
144 |
cp "${FILESDIR}"/fsck_ext2fs.c . |
145 |
emake fsck_ext2fs || die |
146 |
fi |
147 |
} |
148 |
|
149 |
pkg_preinst() { |
150 |
if [[ -r ${ROOT}/etc/mtab ]] ; then |
151 |
if [[ $(<"${ROOT}"/etc/mtab) == "${PN} crap for src_test" ]] ; then |
152 |
rm -f "${ROOT}"/etc/mtab |
153 |
fi |
154 |
fi |
155 |
} |
156 |
|
157 |
src_install() { |
158 |
emake STRIP=: DESTDIR="${D}" install install-libs || die |
159 |
dodoc README RELEASE-NOTES |
160 |
|
161 |
# Move shared libraries to /lib/, install static libraries to /usr/lib/, |
162 |
# and install linker scripts to /usr/lib/. |
163 |
set -- "${D}"/usr/$(get_libdir)/*.a |
164 |
set -- ${@/*\/lib} |
165 |
gen_usr_ldscript -a "${@/.a}" |
166 |
|
167 |
if use elibc_FreeBSD ; then |
168 |
# Install helpers for us |
169 |
into / |
170 |
dosbin "${S}"/fsck_ext2fs || die |
171 |
doman "${FILESDIR}"/fsck_ext2fs.8 |
172 |
|
173 |
# these manpages are already provided by FreeBSD libc |
174 |
# and filefrag is linux only |
175 |
rm -f \ |
176 |
"${D}"/usr/sbin/filefrag \ |
177 |
"${D}"/usr/share/man/man8/filefrag.8 \ |
178 |
"${D}"/usr/bin/uuidgen \ |
179 |
"${D}"/usr/share/man/man3/{uuid,uuid_compare}.3 \ |
180 |
"${D}"/usr/share/man/man1/uuidgen.1 || die |
181 |
fi |
182 |
} |