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