1 |
vapier 08/10/02 18:16:09 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: e2fsprogs-1.41.2.ebuild |
5 |
Log: |
6 |
Version bump. |
7 |
(Portage version: 2.2_rc8/cvs/Linux 2.6.26.2 x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.160 sys-fs/e2fsprogs/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/e2fsprogs/ChangeLog?rev=1.160&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/e2fsprogs/ChangeLog?rev=1.160&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/e2fsprogs/ChangeLog?r1=1.159&r2=1.160 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v |
19 |
retrieving revision 1.159 |
20 |
retrieving revision 1.160 |
21 |
diff -u -r1.159 -r1.160 |
22 |
--- ChangeLog 1 Sep 2008 21:01:49 -0000 1.159 |
23 |
+++ ChangeLog 2 Oct 2008 18:16:09 -0000 1.160 |
24 |
@@ -1,6 +1,12 @@ |
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.159 2008/09/01 21:01:49 vapier Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.160 2008/10/02 18:16:09 vapier Exp $ |
29 |
+ |
30 |
+*e2fsprogs-1.41.2 (02 Oct 2008) |
31 |
+ |
32 |
+ 02 Oct 2008; Mike Frysinger <vapier@g.o> |
33 |
+ +files/e2fsprogs-1.41.2-makefile.patch, +e2fsprogs-1.41.2.ebuild: |
34 |
+ Version bump. |
35 |
|
36 |
*e2fsprogs-1.41.1 (01 Sep 2008) |
37 |
|
38 |
|
39 |
|
40 |
|
41 |
1.1 sys-fs/e2fsprogs/e2fsprogs-1.41.2.ebuild |
42 |
|
43 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.41.2.ebuild?rev=1.1&view=markup |
44 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.41.2.ebuild?rev=1.1&content-type=text/plain |
45 |
|
46 |
Index: e2fsprogs-1.41.2.ebuild |
47 |
=================================================================== |
48 |
# Copyright 1999-2008 Gentoo Foundation |
49 |
# Distributed under the terms of the GNU General Public License v2 |
50 |
# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.41.2.ebuild,v 1.1 2008/10/02 18:16:09 vapier Exp $ |
51 |
|
52 |
inherit eutils flag-o-matic toolchain-funcs multilib |
53 |
|
54 |
DESCRIPTION="Standard EXT2 and EXT3 filesystem utilities" |
55 |
HOMEPAGE="http://e2fsprogs.sourceforge.net/" |
56 |
SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.gz" |
57 |
|
58 |
LICENSE="GPL-2 BSD" |
59 |
SLOT="0" |
60 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" |
61 |
IUSE="nls elibc_FreeBSD" |
62 |
|
63 |
RDEPEND="~sys-libs/${PN}-libs-${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 |
epatch "${FILESDIR}"/${PN}-1.41.2-makefile.patch |
74 |
epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch |
75 |
# blargh ... trick e2fsprogs into using e2fsprogs-libs |
76 |
rm -rf doc |
77 |
sed -i -r \ |
78 |
-e 's:@LIBINTL@:@LTLIBINTL@:' \ |
79 |
-e '/^LIB(BLKID|COM_ERR|SS|UUID)/s:[$][(]LIB[)]/lib([^@]*)@LIB_EXT@:-l\1:' \ |
80 |
-e '/^DEPLIB(BLKID|COM_ERR|SS|UUID)/s:=.*:=:' \ |
81 |
MCONFIG.in || die "muck libs" #122368 |
82 |
sed -i -r \ |
83 |
-e '/^LIB_SUBDIRS/s:lib/(blkid|et|ss|uuid)::g' \ |
84 |
Makefile.in || die "remove subdirs" |
85 |
touch lib/ss/ss_err.h |
86 |
} |
87 |
|
88 |
src_compile() { |
89 |
# Keep the package from doing silly things |
90 |
addwrite /var/cache/fonts |
91 |
export LDCONFIG=: |
92 |
export CC=$(tc-getCC) |
93 |
export STRIP=: |
94 |
|
95 |
# We want to use the "bsd" libraries while building on Darwin, but while |
96 |
# building on other Gentoo/*BSD we prefer elf-naming scheme. |
97 |
local libtype |
98 |
case ${CHOST} in |
99 |
*-darwin*) libtype=bsd;; |
100 |
*) libtype=elf;; |
101 |
esac |
102 |
|
103 |
econf \ |
104 |
--bindir=/bin \ |
105 |
--sbindir=/sbin \ |
106 |
--enable-${libtype}-shlibs \ |
107 |
--with-ldopts="${LDFLAGS}" \ |
108 |
$(use_enable !elibc_uclibc tls) \ |
109 |
--without-included-gettext \ |
110 |
$(use_enable nls) \ |
111 |
$(use_enable userland_GNU fsck) \ |
112 |
|| die |
113 |
if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then |
114 |
eerror "INTL sanity check failed, aborting build." |
115 |
eerror "Please post your ${S}/config.log file as an" |
116 |
eerror "attachment to http://bugs.gentoo.org/show_bug.cgi?id=81096" |
117 |
die "Preventing included intl cruft from building" |
118 |
fi |
119 |
emake COMPILE_ET=compile_et MK_CMDS=mk_cmds || die |
120 |
|
121 |
# Build the FreeBSD helper |
122 |
if use elibc_FreeBSD ; then |
123 |
cp "${FILESDIR}"/fsck_ext2fs.c . |
124 |
emake fsck_ext2fs || die |
125 |
fi |
126 |
} |
127 |
|
128 |
src_install() { |
129 |
emake DESTDIR="${D}" install || die |
130 |
emake DESTDIR="${D}" install-libs || die |
131 |
dodoc README RELEASE-NOTES |
132 |
|
133 |
# Move shared libraries to /lib/, install static libraries to /usr/lib/, |
134 |
# and install linker scripts to /usr/lib/. |
135 |
dodir /$(get_libdir) |
136 |
local lib slib |
137 |
for lib in "${D}"/usr/$(get_libdir)/*.a ; do |
138 |
slib=${lib##*/} |
139 |
mv "${lib%.a}"$(get_libname)* "${D}"/$(get_libdir)/ || die "moving lib ${slib}" |
140 |
gen_usr_ldscript ${slib%.a}$(get_libname) |
141 |
done |
142 |
|
143 |
# move 'useless' stuff to /usr/ |
144 |
dosbin "${D}"/sbin/mklost+found |
145 |
rm -f "${D}"/sbin/mklost+found |
146 |
|
147 |
if use elibc_FreeBSD ; then |
148 |
# Install helpers for us |
149 |
into / |
150 |
dosbin "${S}"/fsck_ext2fs || die |
151 |
doman "${FILESDIR}"/fsck_ext2fs.8 |
152 |
|
153 |
# these manpages are already provided by FreeBSD libc |
154 |
# and filefrag is linux only |
155 |
rm -f \ |
156 |
"${D}"/sbin/filefrag \ |
157 |
"${D}"/usr/share/man/man8/filefrag.8 \ |
158 |
"${D}"/bin/uuidgen \ |
159 |
"${D}"/usr/share/man/man3/{uuid,uuid_compare}.3 \ |
160 |
"${D}"/usr/share/man/man1/uuidgen.1 || die |
161 |
fi |
162 |
} |