Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-fs/e2fsprogs: ChangeLog e2fsprogs-1.41.1.ebuild
Date: Mon, 01 Sep 2008 21:01:53
Message-Id: E1KaGWz-00031T-SO@stork.gentoo.org
1 vapier 08/09/01 21:01:49
2
3 Modified: ChangeLog
4 Added: e2fsprogs-1.41.1.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.159 sys-fs/e2fsprogs/ChangeLog
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/e2fsprogs/ChangeLog?rev=1.159&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/e2fsprogs/ChangeLog?rev=1.159&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/e2fsprogs/ChangeLog?r1=1.158&r2=1.159
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v
19 retrieving revision 1.158
20 retrieving revision 1.159
21 diff -u -r1.158 -r1.159
22 --- ChangeLog 16 Aug 2008 15:32:12 -0000 1.158
23 +++ ChangeLog 1 Sep 2008 21:01:49 -0000 1.159
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.158 2008/08/16 15:32:12 vapier Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.159 2008/09/01 21:01:49 vapier Exp $
29 +
30 +*e2fsprogs-1.41.1 (01 Sep 2008)
31 +
32 + 01 Sep 2008; Mike Frysinger <vapier@g.o> +e2fsprogs-1.41.1.ebuild:
33 + Version bump.
34
35 16 Aug 2008; Mike Frysinger <vapier@g.o> e2fsprogs-1.41.0.ebuild:
36 Drop USE=static since it just confuses people #232115 #178718.
37
38
39
40 1.1 sys-fs/e2fsprogs/e2fsprogs-1.41.1.ebuild
41
42 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.41.1.ebuild?rev=1.1&view=markup
43 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.41.1.ebuild?rev=1.1&content-type=text/plain
44
45 Index: e2fsprogs-1.41.1.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.41.1.ebuild,v 1.1 2008/09/01 21:01:49 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 src_unpack() {
69 unpack ${A}
70 cd "${S}"
71 epatch "${FILESDIR}"/${PN}-1.38-tests-locale.patch #99766
72 epatch "${FILESDIR}"/${PN}-1.41.0-makefile.patch
73 epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch
74 # blargh ... trick e2fsprogs into using e2fsprogs-libs
75 rm -rf doc
76 sed -i -r \
77 -e 's:@LIBINTL@:@LTLIBINTL@:' \
78 -e '/^LIB(BLKID|COM_ERR|SS|UUID)/s:[$][(]LIB[)]/lib([^@]*)@LIB_EXT@:-l\1:' \
79 -e '/^DEPLIB(BLKID|COM_ERR|SS|UUID)/s:=.*:=:' \
80 MCONFIG.in || die "muck libs" #122368
81 sed -i -r \
82 -e '/^LIB_SUBDIRS/s:lib/(blkid|et|ss|uuid)::g' \
83 Makefile.in || die "remove subdirs"
84 touch lib/ss/ss_err.h
85 }
86
87 src_compile() {
88 # Keep the package from doing silly things
89 addwrite /var/cache/fonts
90 export LDCONFIG=:
91 export CC=$(tc-getCC)
92 export STRIP=:
93
94 # We want to use the "bsd" libraries while building on Darwin, but while
95 # building on other Gentoo/*BSD we prefer elf-naming scheme.
96 local libtype
97 case ${CHOST} in
98 *-darwin*) libtype=bsd;;
99 *) libtype=elf;;
100 esac
101
102 econf \
103 --bindir=/bin \
104 --sbindir=/sbin \
105 --enable-${libtype}-shlibs \
106 --with-ldopts="${LDFLAGS}" \
107 $(use_enable !elibc_uclibc tls) \
108 --without-included-gettext \
109 $(use_enable nls) \
110 $(use_enable userland_GNU fsck) \
111 || die
112 if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
113 eerror "INTL sanity check failed, aborting build."
114 eerror "Please post your ${S}/config.log file as an"
115 eerror "attachment to http://bugs.gentoo.org/show_bug.cgi?id=81096"
116 die "Preventing included intl cruft from building"
117 fi
118 emake COMPILE_ET=compile_et MK_CMDS=mk_cmds || die
119
120 # Build the FreeBSD helper
121 if use elibc_FreeBSD ; then
122 cp "${FILESDIR}"/fsck_ext2fs.c .
123 emake fsck_ext2fs || die
124 fi
125 }
126
127 src_install() {
128 emake DESTDIR="${D}" install || die
129 emake DESTDIR="${D}" install-libs || die
130 dodoc README RELEASE-NOTES
131
132 # Move shared libraries to /lib/, install static libraries to /usr/lib/,
133 # and install linker scripts to /usr/lib/.
134 dodir /$(get_libdir)
135 local lib slib
136 for lib in "${D}"/usr/$(get_libdir)/*.a ; do
137 slib=${lib##*/}
138 mv "${lib%.a}"$(get_libname)* "${D}"/$(get_libdir)/ || die "moving lib ${slib}"
139 gen_usr_ldscript ${slib%.a}$(get_libname)
140 done
141
142 # move 'useless' stuff to /usr/
143 dosbin "${D}"/sbin/mklost+found
144 rm -f "${D}"/sbin/mklost+found
145
146 if use elibc_FreeBSD ; then
147 # Install helpers for us
148 into /
149 dosbin "${S}"/fsck_ext2fs || die
150 doman "${FILESDIR}"/fsck_ext2fs.8
151
152 # these manpages are already provided by FreeBSD libc
153 # and filefrag is linux only
154 rm -f \
155 "${D}"/sbin/filefrag \
156 "${D}"/usr/share/man/man8/filefrag.8 \
157 "${D}"/bin/uuidgen \
158 "${D}"/usr/share/man/man3/{uuid,uuid_compare}.3 \
159 "${D}"/usr/share/man/man1/uuidgen.1 || die
160 fi
161 }