| 1 |
vapier 11/09/01 19:32:05 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: e2fsprogs-1.42_pre0702.ebuild |
| 5 |
Log: |
| 6 |
Add WIP from upstream #379573 by Sebastian Pipping. |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha51/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.234 sys-fs/e2fsprogs/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/e2fsprogs/ChangeLog?rev=1.234&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/e2fsprogs/ChangeLog?rev=1.234&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/e2fsprogs/ChangeLog?r1=1.233&r2=1.234 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v |
| 20 |
retrieving revision 1.233 |
| 21 |
retrieving revision 1.234 |
| 22 |
diff -u -r1.233 -r1.234 |
| 23 |
--- ChangeLog 29 Aug 2011 06:13:48 -0000 1.233 |
| 24 |
+++ ChangeLog 1 Sep 2011 19:32:05 -0000 1.234 |
| 25 |
@@ -1,6 +1,12 @@ |
| 26 |
# ChangeLog for sys-fs/e2fsprogs |
| 27 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.233 2011/08/29 06:13:48 jer Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.234 2011/09/01 19:32:05 vapier Exp $ |
| 30 |
+ |
| 31 |
+*e2fsprogs-1.42_pre0702 (01 Sep 2011) |
| 32 |
+ |
| 33 |
+ 01 Sep 2011; Mike Frysinger <vapier@g.o> |
| 34 |
+ +e2fsprogs-1.42_pre0702.ebuild: |
| 35 |
+ Add WIP from upstream #379573 by Sebastian Pipping. |
| 36 |
|
| 37 |
29 Aug 2011; Jeroen Roovers <jer@g.o> e2fsprogs-1.41.14.ebuild: |
| 38 |
Stable for HPPA (bug #378039). |
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
1.1 sys-fs/e2fsprogs/e2fsprogs-1.42_pre0702.ebuild |
| 43 |
|
| 44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42_pre0702.ebuild?rev=1.1&view=markup |
| 45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42_pre0702.ebuild?rev=1.1&content-type=text/plain |
| 46 |
|
| 47 |
Index: e2fsprogs-1.42_pre0702.ebuild |
| 48 |
=================================================================== |
| 49 |
# Copyright 1999-2011 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_pre0702.ebuild,v 1.1 2011/09/01 19:32:05 vapier Exp $ |
| 52 |
|
| 53 |
case ${PV} in |
| 54 |
*_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;; |
| 55 |
*) UP_PV=${PV} ;; |
| 56 |
esac |
| 57 |
|
| 58 |
EAPI="3" |
| 59 |
|
| 60 |
inherit 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 |
|
| 66 |
LICENSE="GPL-2 BSD" |
| 67 |
SLOT="0" |
| 68 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint" |
| 69 |
IUSE="nls elibc_FreeBSD" |
| 70 |
|
| 71 |
RDEPEND="~sys-libs/${PN}-libs-${PV} |
| 72 |
>=sys-apps/util-linux-2.16 |
| 73 |
nls? ( virtual/libintl )" |
| 74 |
DEPEND="${RDEPEND} |
| 75 |
nls? ( sys-devel/gettext ) |
| 76 |
dev-util/pkgconfig |
| 77 |
sys-apps/texinfo" |
| 78 |
|
| 79 |
S=${WORKDIR}/${P%_pre*} |
| 80 |
|
| 81 |
pkg_setup() { |
| 82 |
if [[ ! -e ${EROOT}/etc/mtab ]] ; then |
| 83 |
# add some crap to deal with missing /etc/mtab #217719 |
| 84 |
ewarn "No /etc/mtab file, creating one temporarily" |
| 85 |
echo "${PN} crap for src_test" > "${EROOT}"/etc/mtab |
| 86 |
fi |
| 87 |
} |
| 88 |
|
| 89 |
src_prepare() { |
| 90 |
epatch "${FILESDIR}"/${PN}-1.38-tests-locale.patch #99766 |
| 91 |
epatch "${FILESDIR}"/${PN}-1.41.8-makefile.patch |
| 92 |
epatch "${FILESDIR}"/${PN}-1.41.12-getpagesize.patch |
| 93 |
epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch |
| 94 |
# use symlinks rather than hardlinks |
| 95 |
sed -i \ |
| 96 |
-e 's:$(LN) -f $(DESTDIR).*/:$(LN_S) -f :' \ |
| 97 |
{e2fsck,misc}/Makefile.in || die |
| 98 |
epatch "${FILESDIR}"/${PN}-1.41.12-darwin-makefile.patch |
| 99 |
if [[ ${CHOST} == *-mint* ]] ; then |
| 100 |
epatch "${FILESDIR}"/${PN}-1.41-mint.patch |
| 101 |
epatch "${FILESDIR}"/${PN}-1.41.12-mint-blkid.patch |
| 102 |
fi |
| 103 |
# blargh ... trick e2fsprogs into using e2fsprogs-libs |
| 104 |
rm -rf doc |
| 105 |
sed -i -r \ |
| 106 |
-e 's:@LIBINTL@:@LTLIBINTL@:' \ |
| 107 |
-e '/^LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@LIB_EXT@:-l\1:' \ |
| 108 |
-e '/^DEPLIB(COM_ERR|SS)/s:=.*:=:' \ |
| 109 |
MCONFIG.in || die "muck libs" #122368 |
| 110 |
sed -i -r \ |
| 111 |
-e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \ |
| 112 |
Makefile.in || die "remove subdirs" |
| 113 |
sed -i \ |
| 114 |
-e '/^#define _XOPEN/i#define _GNU_SOURCE' \ |
| 115 |
misc/mke2fs.c || die # needs open64() prototype |
| 116 |
|
| 117 |
# Avoid rebuild |
| 118 |
touch lib/ss/ss_err.h |
| 119 |
} |
| 120 |
|
| 121 |
src_configure() { |
| 122 |
# Keep the package from doing silly things #261411 |
| 123 |
export VARTEXFONTS=${T}/fonts |
| 124 |
|
| 125 |
# We want to use the "bsd" libraries while building on Darwin, but while |
| 126 |
# building on other Gentoo/*BSD we prefer elf-naming scheme. |
| 127 |
local libtype |
| 128 |
case ${CHOST} in |
| 129 |
*-darwin*) libtype=--enable-bsd-shlibs ;; |
| 130 |
*-mint*) libtype= ;; |
| 131 |
*) libtype=--enable-elf-shlibs ;; |
| 132 |
esac |
| 133 |
|
| 134 |
ac_cv_path_LDCONFIG=: \ |
| 135 |
econf \ |
| 136 |
--with-root-prefix="${EPREFIX}/" \ |
| 137 |
${libtype} \ |
| 138 |
$(tc-has-tls || echo --disable-tls) \ |
| 139 |
--without-included-gettext \ |
| 140 |
$(use_enable nls) \ |
| 141 |
--disable-libblkid \ |
| 142 |
--disable-libuuid \ |
| 143 |
--disable-fsck \ |
| 144 |
--disable-uuidd |
| 145 |
if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then |
| 146 |
eerror "INTL sanity check failed, aborting build." |
| 147 |
eerror "Please post your ${S}/config.log file as an" |
| 148 |
eerror "attachment to http://bugs.gentoo.org/show_bug.cgi?id=81096" |
| 149 |
die "Preventing included intl cruft from building" |
| 150 |
fi |
| 151 |
} |
| 152 |
|
| 153 |
src_compile() { |
| 154 |
emake COMPILE_ET=compile_et MK_CMDS=mk_cmds || die |
| 155 |
|
| 156 |
# Build the FreeBSD helper |
| 157 |
if use elibc_FreeBSD ; then |
| 158 |
cp "${FILESDIR}"/fsck_ext2fs.c . |
| 159 |
emake fsck_ext2fs || die |
| 160 |
fi |
| 161 |
} |
| 162 |
|
| 163 |
pkg_preinst() { |
| 164 |
if [[ -r ${EROOT}/etc/mtab ]] ; then |
| 165 |
if [[ $(<"${EROOT}"/etc/mtab) == "${PN} crap for src_test" ]] ; then |
| 166 |
rm -f "${EROOT}"/etc/mtab |
| 167 |
fi |
| 168 |
fi |
| 169 |
} |
| 170 |
|
| 171 |
src_install() { |
| 172 |
# need to set root_libdir= manually as any --libdir options in the |
| 173 |
# econf above (i.e. multilib) will screw up the default #276465 |
| 174 |
emake \ |
| 175 |
STRIP=: \ |
| 176 |
root_libdir="${EPREFIX}/usr/$(get_libdir)" \ |
| 177 |
DESTDIR="${D}" \ |
| 178 |
install install-libs || die |
| 179 |
dodoc README RELEASE-NOTES |
| 180 |
|
| 181 |
insinto /etc |
| 182 |
doins "${FILESDIR}"/e2fsck.conf || die |
| 183 |
|
| 184 |
# Move shared libraries to /lib/, install static libraries to |
| 185 |
# /usr/lib/, and install linker scripts to /usr/lib/. |
| 186 |
set -- "${ED}"/usr/$(get_libdir)/*.a |
| 187 |
set -- ${@/*\/lib} |
| 188 |
gen_usr_ldscript -a "${@/.a}" |
| 189 |
|
| 190 |
if use elibc_FreeBSD ; then |
| 191 |
# Install helpers for us |
| 192 |
into / |
| 193 |
dosbin "${S}"/fsck_ext2fs || die |
| 194 |
doman "${FILESDIR}"/fsck_ext2fs.8 || die |
| 195 |
|
| 196 |
# filefrag is linux only |
| 197 |
rm \ |
| 198 |
"${ED}"/usr/sbin/filefrag \ |
| 199 |
"${ED}"/usr/share/man/man8/filefrag.8 || die |
| 200 |
fi |
| 201 |
} |
Archives