From: Mike Frysinger Date: Fri, 12 Nov 2004 03:36:23 +0000 (+0000) Subject: Put the dietlibc stuff back; pretend like lv was NEVER HERE X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=869c200ca1b5a586f809c2b4f0672629eb90b969;p=gentoo.git Put the dietlibc stuff back; pretend like lv was NEVER HERE --- diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog index 22255860a57c..de2239a5a980 100644 --- a/sys-fs/e2fsprogs/ChangeLog +++ b/sys-fs/e2fsprogs/ChangeLog @@ -1,20 +1,12 @@ # ChangeLog for sys-fs/e2fsprogs # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.37 2004/11/12 03:21:16 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.38 2004/11/12 03:36:23 vapier Exp $ 11 Nov 2004; Mike Frysinger e2fsprogs-1.35-r1.ebuild, e2fsprogs-1.35.ebuild: Set $LDCONFIG so stupid configure script doesnt try to run /sbin/ldconfig for us. -*e2fsprogs-1.35-r2 (04 Oct 2004) - - 04 Oct 2004; Travis Tilley +e2fsprogs-1.35-r2.ebuild: - added a new e2fsprogs ebuild with the dietlibc changes, masked -* - - 03 Oct 2004; Travis Tilley e2fsprogs-1.35-r1.ebuild: - reverted the dietlibc changes. they cause compile problems here. - 03 Oct 2004; Mike Frysinger e2fsprogs-1.35-r1.ebuild: Support dietlibc #36306 by Adam. diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest index 86f040a40ae7..3b7166ab5b06 100644 --- a/sys-fs/e2fsprogs/Manifest +++ b/sys-fs/e2fsprogs/Manifest @@ -1,10 +1,9 @@ -MD5 e1e00f9b6c50dac64c39c550674c9f2a ChangeLog 8866 +MD5 995c1bcb27773f0eb52470118a3dda5d ChangeLog 8552 MD5 11f6d7ba53227f4104cf0c76fc29d554 e2fsprogs-1.34.ebuild 2768 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 MD5 2edb0d073060c192284a71d32d02adcc e2fsprogs-1.34-r1.ebuild 2884 MD5 3a25e968d4e9df1c0942bbd5ecc54c5a e2fsprogs-1.35.ebuild 2821 -MD5 a687b0b49d2c9c61ef4c063bbf907592 e2fsprogs-1.35-r1.ebuild 3109 -MD5 83fead0fbd1ea1c0ec216479b3577af9 e2fsprogs-1.35-r2.ebuild 3170 +MD5 14a4da89d1dcccfdc7381b97c4329626 e2fsprogs-1.35-r1.ebuild 3200 MD5 9c39bba6702e492a7a01624ae60587bc files/digest-e2fsprogs-1.34 67 MD5 1a896f2697b055d4b8b4139c3482ac9e files/e2fsprogs-1.32-mk_cmds-cosmetic.patch 316 MD5 d9d69b54c577273521f4b8c2013a7a09 files/e2fsprogs-1.34-kernel-2.6-fix.patch 934 @@ -13,4 +12,3 @@ MD5 9c39bba6702e492a7a01624ae60587bc files/digest-e2fsprogs-1.34-r1 67 MD5 b3b97c7ba36458e2842891e96e1ce0de files/e2fsprogs-1.34-swap-symlink.diff 1091 MD5 3d9735f2397680a4978124f6805219ae files/digest-e2fsprogs-1.35 67 MD5 3d9735f2397680a4978124f6805219ae files/digest-e2fsprogs-1.35-r1 67 -MD5 3d9735f2397680a4978124f6805219ae files/digest-e2fsprogs-1.35-r2 67 diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.35-r1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.35-r1.ebuild index b72921f01b95..659d2563a05d 100644 --- a/sys-fs/e2fsprogs/e2fsprogs-1.35-r1.ebuild +++ b/sys-fs/e2fsprogs/e2fsprogs-1.35-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.35-r1.ebuild,v 1.5 2004/11/12 03:21:16 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.35-r1.ebuild,v 1.6 2004/11/12 03:36:23 vapier Exp $ inherit eutils flag-o-matic gnuconfig @@ -11,12 +11,13 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm hppa amd64 ~ia64 ~ppc64 ~s390" -IUSE="nls static" +IUSE="nls static diet" -DEPEND="virtual/libc +RDEPEND="!diet? ( virtual/libc ) + diet? ( dev-libs/dietlibc )" +DEPEND="${RDEPEND} nls? ( sys-devel/gettext ) sys-apps/texinfo" -RDEPEND="virtual/libc" src_unpack() { unpack ${A} @@ -44,6 +45,7 @@ src_compile() { use static \ && myconf="${myconf} --with-ldopts=-static" \ || myconf="${myconf} --enable-dynamic-e2fsck --enable-elf-shlibs" + use diet && myconf="${myconf} --with-diet-libc" econf \ $(use_enable nls) \ ${myconf} || die @@ -110,7 +112,6 @@ src_install() { # There are awk files that don't get installed when doing # a 'make install'. They are the template files for # /bin/compile_et. - cd ${S}/$(get_libdir)/et insinto /usr/share/et doins et_c.awk et_h.awk diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.35-r2.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.35-r2.ebuild deleted file mode 100644 index ade2919d1d27..000000000000 --- a/sys-fs/e2fsprogs/e2fsprogs-1.35-r2.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.35-r2.ebuild,v 1.1 2004/10/05 01:59:52 lv Exp $ - -inherit eutils flag-o-matic gnuconfig - -DESCRIPTION="Standard EXT2 and EXT3 filesystem utilities" -HOMEPAGE="http://e2fsprogs.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="-*" -#KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm hppa amd64 ~ia64 ~ppc64 ~s390" -IUSE="nls static diet" - -RDEPEND="!diet? ( virtual/libc ) - diet? ( dev-libs/dietlibc )" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext ) - sys-apps/texinfo" - -src_unpack() { - unpack ${A} - # Fix a cosmetic error in mk_cmds's help output. - cd ${S}; epatch ${FILESDIR}/e2fsprogs-1.32-mk_cmds-cosmetic.patch - # Userpriv fix. Closes #27348 - chmod u+w po/*.po - # Patch to make the configure and sed scripts more friendly to, - # for example, the Estonian locale - epatch ${FILESDIR}/${PN}-sed-locale.patch - - gnuconfig_update - - # Use -fPIC compiled shared files in .a files. Fix kdelibs-3.3.0 compilation on hppa. - use static || sed -e '/ARUPD/s:$(OBJS):elfshared/*.o:' -i ${S}/lib/Makefile.library -} - -src_compile() { - local myconf - - # building e2fsprogs on sparc results in silo breaking - [ "${ARCH}" = "sparc" ] && filter-flags "-fstack-protector" - - use static \ - && myconf="${myconf} --with-ldopts=-static" \ - || myconf="${myconf} --enable-dynamic-e2fsck --enable-elf-shlibs" - - econf \ - $(use_enable nls) \ - $(use_with diet diet-libc) \ - ${myconf} || die - - # Parallel make sometimes fails - emake -j1 || die -} - -src_install() { - make DESTDIR=${D} libdir=/zapme install || die - #evil e2fsprogs makefile -- I'll get you! - rm -rf ${D}/zapme - - make DESTDIR=${D} install-libs || die - - #There is .po file b0rkage with 1.33; commenting this out (drobbins, 21 Apr 2003) - #if use nls; then - # make -C po DESTDIR=${D} install || die - #fi - - dodoc ChangeLog README RELEASE-NOTES SHLIBS - docinto e2fsck - dodoc e2fsck/ChangeLog e2fsck/CHANGES - - dodir /$(get_libdir) /bin /sbin - cd ${D}/usr/$(get_libdir) - mv * ../../$(get_libdir) - cd ${D}/$(get_libdir) - mv *.a ../usr/$(get_libdir) - local mylib="" - local x="" - #install ldscripts to fix bug #4411 - cd ${D}/usr/$(get_libdir) - for x in *.a - do - [ ! -f ${x} ] && continue - gen_usr_ldscript ${x/a}so - done - #normalize evil symlinks - cd ${D}/$(get_libdir) - for x in * - do - [ ! -L ${x} ] && continue - mylib="`readlink ${x}`" - mylib="`basename ${mylib}`" - ln -sf ${mylib} ${x} - done - - mv ${D}/usr/sbin/* ${D}/sbin - cd ${D}/usr/bin - mv lsattr chattr uuidgen ../../bin - cd ${D}/sbin - mv mklost+found ../usr/sbin - #time to convert hard links/duplicates to symbolic links - cd ${D}/sbin - rm fsck.* - ln -sf e2fsck fsck.ext2 - ln -sf e2fsck fsck.ext3 - rm mkfs.* - ln -sf mke2fs mkfs.ext2 - ln -sf mke2fs mkfs.ext3 - - # 03 Aug 2002 - # There are awk files that don't get installed when doing - # a 'make install'. They are the template files for - # /bin/compile_et. - - cd ${S}/$(get_libdir)/et - insinto /usr/share/et - doins et_c.awk et_h.awk - cd ${S}/$(get_libdir)/ss - insinto /usr/share/ss - doins ct_c.awk -} diff --git a/sys-fs/e2fsprogs/files/digest-e2fsprogs-1.35-r2 b/sys-fs/e2fsprogs/files/digest-e2fsprogs-1.35-r2 deleted file mode 100644 index 38322e76f0f4..000000000000 --- a/sys-fs/e2fsprogs/files/digest-e2fsprogs-1.35-r2 +++ /dev/null @@ -1 +0,0 @@ -MD5 8d25ffd60d405ef32d341704a2323807 e2fsprogs-1.35.tar.gz 3152299