summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Marples <uberlord@gentoo.org>2007-09-15 14:20:41 +0000
committerRoy Marples <uberlord@gentoo.org>2007-09-15 14:20:41 +0000
commitd15e5a2e3eaf935816fc218b7c4486bf3755ce09 (patch)
tree3fa62115748db53f63d9ef5826a5b456016644a6 /sys-fs/e2fsprogs
parentDisable webkit. bug #192566 (diff)
downloadhistorical-d15e5a2e3eaf935816fc218b7c4486bf3755ce09.tar.gz
historical-d15e5a2e3eaf935816fc218b7c4486bf3755ce09.tar.bz2
historical-d15e5a2e3eaf935816fc218b7c4486bf3755ce09.zip
emake fsck_ext2fs, install it to /sbin and stop installing filefrag and uuidgen stuff
Package-Manager: portage-2.1.3.9
Diffstat (limited to 'sys-fs/e2fsprogs')
-rw-r--r--sys-fs/e2fsprogs/Manifest8
-rw-r--r--sys-fs/e2fsprogs/e2fsprogs-1.40.2.ebuild16
2 files changed, 14 insertions, 10 deletions
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index a7500928cd4b..5e79d97fe361 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -71,10 +71,10 @@ EBUILD e2fsprogs-1.40.1.ebuild 3584 RMD160 bed78e0da855c8fb36f6a7e8a91e73c28327a
MD5 8c13b4ab7a190d040dd5402aa79b34f5 e2fsprogs-1.40.1.ebuild 3584
RMD160 bed78e0da855c8fb36f6a7e8a91e73c28327ab75 e2fsprogs-1.40.1.ebuild 3584
SHA256 f273f0dafcf092c546856519d02e78e2d4e164921352231c15836f533f778b67 e2fsprogs-1.40.1.ebuild 3584
-EBUILD e2fsprogs-1.40.2.ebuild 3973 RMD160 3e48c9d123cb5b15050a5322ec839ffcdb6dc2a3 SHA1 47a1e4aaef7f7258d1b8c5b9a167ed68f4e4d089 SHA256 9f714fbbc1a70117ad002de8926bf171f67ed5ffede53bf889c85cf09eaa24fb
-MD5 e809b207b836867744344a8fa99df150 e2fsprogs-1.40.2.ebuild 3973
-RMD160 3e48c9d123cb5b15050a5322ec839ffcdb6dc2a3 e2fsprogs-1.40.2.ebuild 3973
-SHA256 9f714fbbc1a70117ad002de8926bf171f67ed5ffede53bf889c85cf09eaa24fb e2fsprogs-1.40.2.ebuild 3973
+EBUILD e2fsprogs-1.40.2.ebuild 4029 RMD160 b335f413c1f5891a32becd67471fd39bf8fbef7f SHA1 82dc3b56fcc06cbeb5d41856e902a6266d6115cc SHA256 0ef74750c37347f73923ff1d6ac514edd8000e35f1b020e8e45147946109a53c
+MD5 06a96bf03a739e02b9b74bda723335ba e2fsprogs-1.40.2.ebuild 4029
+RMD160 b335f413c1f5891a32becd67471fd39bf8fbef7f e2fsprogs-1.40.2.ebuild 4029
+SHA256 0ef74750c37347f73923ff1d6ac514edd8000e35f1b020e8e45147946109a53c e2fsprogs-1.40.2.ebuild 4029
EBUILD e2fsprogs-1.40.ebuild 3755 RMD160 4f4be7e00db70e664bcd2decd8bca753c1986846 SHA1 21a478adcb58d2c8d08a7851f39369eaaa03bf27 SHA256 4d29aba74951e171b0c80037181a6f178288190db8bd892aea61876d7105b30a
MD5 b55a92cff12ba7d74ecc90caaec63aa3 e2fsprogs-1.40.ebuild 3755
RMD160 4f4be7e00db70e664bcd2decd8bca753c1986846 e2fsprogs-1.40.ebuild 3755
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.40.2.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.40.2.ebuild
index 7fcbda07b4a8..58d2b69f1f86 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.40.2.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.40.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.40.2.ebuild,v 1.2 2007/09/15 08:54:25 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.40.2.ebuild,v 1.3 2007/09/15 14:20:41 uberlord Exp $
inherit eutils flag-o-matic toolchain-funcs
@@ -45,6 +45,7 @@ src_unpack() {
-e '/^LIB_SUBDIRS/s:lib/et::' \
-e '/^LIB_SUBDIRS/s:lib/ss::' \
Makefile.in || die "remove subdirs"
+
ln -s "${ROOT}"/usr/$(get_libdir)/libcom_err.a lib/libcom_err.a
ln -s "${ROOT}"/$(get_libdir)/libcom_err.so lib/libcom_err.so
ln -s /usr/bin/mk_cmds lib/ss/mk_cmds
@@ -86,7 +87,8 @@ src_compile() {
# Build the FreeBSD helper
if use elibc_FreeBSD ; then
- ${CC} "${FILESDIR}"/fsck_ext2fs.c -o fsck_ext2fs || die
+ cp "${FILESDIR}"/fsck_ext2fs.c .
+ emake fsck_ext2fs || die
fi
}
@@ -114,15 +116,17 @@ src_install() {
if use elibc_FreeBSD ; then
# Install helpers for us
- dosbin "${S}"/fsck_ext2fs
+ into /
+ dosbin "${S}"/fsck_ext2fs || die
doman "${FILESDIR}"/fsck_ext2fs.8
# these manpages are already provided by FreeBSD libc
# and filefrag is linux only
rm -f \
- "${D}"/sbin/filefrag
- "${D}"/usr/share/man/man8/filefrag.8
+ "${D}"/sbin/filefrag \
+ "${D}"/usr/share/man/man8/filefrag.8 \
+ "${D}"/bin/uuidgen \
"${D}"/usr/share/man/man3/{uuid,uuid_compare}.3 \
- "${D}"/usr/share/man/man1/uuidgen.1
+ "${D}"/usr/share/man/man1/uuidgen.1 || die
fi
}