| 1 |
vapier 08/06/18 09:33:57 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: e2fsprogs-1.40.11.ebuild |
| 5 |
Log: |
| 6 |
Version bump. |
| 7 |
(Portage version: 2.2_pre8/cvs/Linux 2.6.25 x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.155 sys-fs/e2fsprogs/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/e2fsprogs/ChangeLog?rev=1.155&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/e2fsprogs/ChangeLog?rev=1.155&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/e2fsprogs/ChangeLog?r1=1.154&r2=1.155 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v |
| 19 |
retrieving revision 1.154 |
| 20 |
retrieving revision 1.155 |
| 21 |
diff -u -r1.154 -r1.155 |
| 22 |
--- ChangeLog 14 Jun 2008 11:50:06 -0000 1.154 |
| 23 |
+++ ChangeLog 18 Jun 2008 09:33:56 -0000 1.155 |
| 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.154 2008/06/14 11:50:06 drac Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.155 2008/06/18 09:33:56 vapier Exp $ |
| 29 |
+ |
| 30 |
+*e2fsprogs-1.40.11 (18 Jun 2008) |
| 31 |
+ |
| 32 |
+ 18 Jun 2008; Mike Frysinger <vapier@g.o> +e2fsprogs-1.40.11.ebuild: |
| 33 |
+ Version bump. |
| 34 |
|
| 35 |
14 Jun 2008; Samuli Suominen <drac@g.o> e2fsprogs-1.40.10.ebuild: |
| 36 |
Prevent sandbox violation. addwrite /var/cache/fonts; Font |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.1 sys-fs/e2fsprogs/e2fsprogs-1.40.11.ebuild |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.40.11.ebuild?rev=1.1&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.40.11.ebuild?rev=1.1&content-type=text/plain |
| 44 |
|
| 45 |
Index: e2fsprogs-1.40.11.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.11.ebuild,v 1.1 2008/06/18 09:33:56 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 |
mkdir tc || die |
| 94 |
echo "GROUP ( libcom_err.a )" > tc/libcom_err.a |
| 95 |
echo "GROUP ( libcom_err.so )" > tc/libcom_err.so |
| 96 |
echo "GROUP ( libss.a )" > tc/libss.a |
| 97 |
echo "GROUP ( libss.so )" > tc/libss.so |
| 98 |
sed -i \ |
| 99 |
-e '/^LIB\(SS\|COM_ERR\)/s:$(LIB):$(top_builddir)/tc:' \ |
| 100 |
MCONFIG.in || die |
| 101 |
echo '#include_next <ss/ss_err.h>' > lib/ss/ss_err.h |
| 102 |
ln -s $(type -P mk_cmds) lib/ss/mk_cmds |
| 103 |
ln -s $(type -P compile_et) lib/et/compile_et |
| 104 |
|
| 105 |
# sanity check for Bug 105304 |
| 106 |
if [[ -z ${USERLAND} ]] ; then |
| 107 |
eerror "You just hit Bug 105304, please post your 'emerge info' here:" |
| 108 |
eerror "http://bugs.gentoo.org/105304" |
| 109 |
die "Aborting to prevent screwing your system" |
| 110 |
fi |
| 111 |
} |
| 112 |
|
| 113 |
src_compile() { |
| 114 |
# Keep the package from doing silly things |
| 115 |
addwrite /var/cache/fonts |
| 116 |
export LDCONFIG=: |
| 117 |
export CC=$(tc-getCC) |
| 118 |
export STRIP=: |
| 119 |
|
| 120 |
econf \ |
| 121 |
--bindir=/bin \ |
| 122 |
--sbindir=/sbin \ |
| 123 |
--enable-elf-shlibs \ |
| 124 |
--with-ldopts="${LDFLAGS}" \ |
| 125 |
$(use_enable !static dynamic-e2fsck) \ |
| 126 |
$(use_enable !elibc_uclibc tls) \ |
| 127 |
--without-included-gettext \ |
| 128 |
$(use_enable nls) \ |
| 129 |
$(use_enable userland_GNU fsck) \ |
| 130 |
|| die |
| 131 |
if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then |
| 132 |
eerror "INTL sanity check failed, aborting build." |
| 133 |
eerror "Please post your ${S}/config.log file as an" |
| 134 |
eerror "attachment to http://bugs.gentoo.org/show_bug.cgi?id=81096" |
| 135 |
die "Preventing included intl cruft from building" |
| 136 |
fi |
| 137 |
# Parallel make sometimes fails |
| 138 |
emake -j1 COMPILE_ET=compile_et || die |
| 139 |
|
| 140 |
# Build the FreeBSD helper |
| 141 |
if use elibc_FreeBSD ; then |
| 142 |
cp "${FILESDIR}"/fsck_ext2fs.c . |
| 143 |
emake fsck_ext2fs || die |
| 144 |
fi |
| 145 |
} |
| 146 |
|
| 147 |
src_install() { |
| 148 |
emake DESTDIR="${D}" install || die |
| 149 |
dodoc README RELEASE-NOTES |
| 150 |
|
| 151 |
# Move shared libraries to /lib/, install static libraries to /usr/lib/, |
| 152 |
# and install linker scripts to /usr/lib/. |
| 153 |
dodir /$(get_libdir) |
| 154 |
mv "${D}"/usr/$(get_libdir)/*.so* "${D}"/$(get_libdir)/ |
| 155 |
dolib.a lib/*.a || die "dolib.a" |
| 156 |
rm -f "${D}"/usr/$(get_libdir)/lib{com_err,ss}.a #125146 |
| 157 |
local x |
| 158 |
cd "${D}"/$(get_libdir) |
| 159 |
for x in *.so ; do |
| 160 |
gen_usr_ldscript ${x} || die "gen ldscript ${x}" |
| 161 |
done |
| 162 |
|
| 163 |
# move 'useless' stuff to /usr/ |
| 164 |
dosbin "${D}"/sbin/mklost+found |
| 165 |
rm -f "${D}"/sbin/mklost+found |
| 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}"/sbin/filefrag \ |
| 177 |
"${D}"/usr/share/man/man8/filefrag.8 \ |
| 178 |
"${D}"/bin/uuidgen \ |
| 179 |
"${D}"/usr/share/man/man3/{uuid,uuid_compare}.3 \ |
| 180 |
"${D}"/usr/share/man/man1/uuidgen.1 || die |
| 181 |
fi |
| 182 |
} |
| 183 |
|
| 184 |
|
| 185 |
|
| 186 |
-- |
| 187 |
gentoo-commits@l.g.o mailing list |
Archives