diff options
author | Mike Frysinger <vapier@gentoo.org> | 2009-02-11 00:51:53 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2009-02-11 00:51:53 +0000 |
commit | d2984b021fc98ef28261adc4d76389723ed2f533 (patch) | |
tree | 507f4fc83960e84bec845512f0cd24491813bf66 /sys-libs/e2fsprogs-libs | |
parent | old (diff) | |
download | gentoo-2-d2984b021fc98ef28261adc4d76389723ed2f533.tar.gz gentoo-2-d2984b021fc98ef28261adc4d76389723ed2f533.tar.bz2 gentoo-2-d2984b021fc98ef28261adc4d76389723ed2f533.zip |
old
(Portage version: 2.2_rc23/cvs/Linux x86_64)
Diffstat (limited to 'sys-libs/e2fsprogs-libs')
7 files changed, 0 insertions, 319 deletions
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.41.0.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.41.0.ebuild deleted file mode 100644 index 8f2f8aac6735..000000000000 --- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.41.0.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.41.0.ebuild,v 1.2 2008/08/16 04:59:44 vapier Exp $ - -inherit eutils flag-o-matic toolchain-funcs - -DESCRIPTION="e2fsprogs libraries (common error, subsystem, uuid, block id)" -HOMEPAGE="http://e2fsprogs.sourceforge.net/" -SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="nls" - -RDEPEND="!sys-libs/com_err - !sys-libs/ss - !<sys-fs/e2fsprogs-1.41" -DEPEND="nls? ( sys-devel/gettext ) - sys-devel/bc" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${PN}-1.41.0-makefile.patch - epatch "${FILESDIR}"/${P}-null-blkid.patch -} - -src_compile() { - export LDCONFIG=/bin/true - export CC=$(tc-getCC) - export STRIP=/bin/true - - # We want to use the "bsd" libraries while building on Darwin, but while - # building on other Gentoo/*BSD we prefer elf-naming scheme. - local libtype - case ${CHOST} in - *-darwin*) libtype=bsd;; - *) libtype=elf;; - esac - - econf \ - --enable-${libtype}-shlibs \ - --with-ldopts="${LDFLAGS}" \ - $(use_enable !elibc_uclibc tls) \ - $(use_enable nls) \ - || die - emake || die -} - -src_install() { - export LDCONFIG=/bin/true - export CC=$(tc-getCC) - export STRIP=/bin/true - - emake DESTDIR="${D}" install || die - - dodir /$(get_libdir) - local lib slib - for lib in "${D}"/usr/$(get_libdir)/*.a ; do - slib=${lib##*/} - mv "${lib%.a}"$(get_libname)* "${D}"/$(get_libdir)/ || die "moving lib ${slib}" - gen_usr_ldscript ${slib%.a}$(get_libname) - done -} diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.41.1.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.41.1.ebuild deleted file mode 100644 index d41e7b325afb..000000000000 --- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.41.1.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.41.1.ebuild,v 1.1 2008/09/01 22:29:36 vapier Exp $ - -inherit eutils flag-o-matic toolchain-funcs - -DESCRIPTION="e2fsprogs libraries (common error, subsystem, uuid, block id)" -HOMEPAGE="http://e2fsprogs.sourceforge.net/" -SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="nls" - -RDEPEND="!sys-libs/com_err - !sys-libs/ss - !<sys-fs/e2fsprogs-1.41" -DEPEND="nls? ( sys-devel/gettext ) - sys-devel/bc" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${PN}-1.41.0-makefile.patch - epatch "${FILESDIR}"/${PN}-1.41.1-subs.patch -} - -src_compile() { - export LDCONFIG=/bin/true - export CC=$(tc-getCC) - export STRIP=/bin/true - - # We want to use the "bsd" libraries while building on Darwin, but while - # building on other Gentoo/*BSD we prefer elf-naming scheme. - local libtype - case ${CHOST} in - *-darwin*) libtype=bsd;; - *) libtype=elf;; - esac - - econf \ - --enable-${libtype}-shlibs \ - $(use_enable !elibc_uclibc tls) \ - $(use_enable nls) \ - || die - emake || die -} - -src_install() { - export LDCONFIG=/bin/true - export CC=$(tc-getCC) - export STRIP=/bin/true - - emake DESTDIR="${D}" install || die - - dodir /$(get_libdir) - local lib slib - for lib in "${D}"/usr/$(get_libdir)/*.a ; do - slib=${lib##*/} - mv "${lib%.a}"$(get_libname)* "${D}"/$(get_libdir)/ || die "moving lib ${slib}" - gen_usr_ldscript ${slib%.a}$(get_libname) - done -} diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.41.2.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.41.2.ebuild deleted file mode 100644 index 1db6d21bed8a..000000000000 --- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.41.2.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.41.2.ebuild,v 1.8 2008/11/15 09:42:00 vapier Exp $ - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="e2fsprogs libraries (common error, subsystem, uuid, block id)" -HOMEPAGE="http://e2fsprogs.sourceforge.net/" -SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~x86-fbsd" -IUSE="nls" - -RDEPEND="!sys-libs/com_err - !sys-libs/ss - !<sys-fs/e2fsprogs-1.41" -DEPEND="nls? ( sys-devel/gettext ) - sys-devel/bc" - -src_compile() { - export LDCONFIG=/bin/true - export CC=$(tc-getCC) - - # We want to use the "bsd" libraries while building on Darwin, but while - # building on other Gentoo/*BSD we prefer elf-naming scheme. - local libtype - case ${CHOST} in - *-darwin*) libtype=bsd;; - *) libtype=elf;; - esac - - econf \ - --enable-${libtype}-shlibs \ - $(use_enable !elibc_uclibc tls) \ - $(use_enable nls) \ - || die - emake STRIP=/bin/true || die -} - -src_install() { - export LDCONFIG=/bin/true - export CC=$(tc-getCC) - - emake STRIP=/bin/true DESTDIR="${D}" install || die - - dodir /$(get_libdir) - local lib slib - for lib in "${D}"/usr/$(get_libdir)/*.a ; do - slib=${lib##*/} - mv "${lib%.a}"$(get_libname)* "${D}"/$(get_libdir)/ || die "moving lib ${slib}" - gen_usr_ldscript ${slib%.a}$(get_libname) - done -} diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.41.3.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.41.3.ebuild deleted file mode 100644 index e438c43b2bf2..000000000000 --- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.41.3.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.41.3.ebuild,v 1.10 2008/12/29 20:41:25 vapier Exp $ - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="e2fsprogs libraries (common error, subsystem, uuid, block id)" -HOMEPAGE="http://e2fsprogs.sourceforge.net/" -SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" -IUSE="nls" - -RDEPEND="!sys-libs/com_err - !sys-libs/ss - !<sys-fs/e2fsprogs-1.41" -DEPEND="nls? ( sys-devel/gettext ) - sys-devel/bc" - -src_compile() { - export LDCONFIG=/bin/true - export CC=$(tc-getCC) - - # We want to use the "bsd" libraries while building on Darwin, but while - # building on other Gentoo/*BSD we prefer elf-naming scheme. - local libtype - case ${CHOST} in - *-darwin*) libtype=bsd;; - *) libtype=elf;; - esac - - econf \ - --enable-${libtype}-shlibs \ - $(use_enable !elibc_uclibc tls) \ - $(use_enable nls) \ - || die - emake STRIP=/bin/true || die -} - -src_install() { - export LDCONFIG=/bin/true - export CC=$(tc-getCC) - - emake STRIP=/bin/true DESTDIR="${D}" install || die - - dodir /$(get_libdir) - local lib slib - for lib in "${D}"/usr/$(get_libdir)/*.a ; do - slib=${lib##*/} - mv "${lib%.a}"$(get_libname)* "${D}"/$(get_libdir)/ || die "moving lib ${slib}" - gen_usr_ldscript ${slib%.a}$(get_libname) - done -} diff --git a/sys-libs/e2fsprogs-libs/files/e2fsprogs-libs-1.41.0-makefile.patch b/sys-libs/e2fsprogs-libs/files/e2fsprogs-libs-1.41.0-makefile.patch deleted file mode 100644 index f96dd89c1962..000000000000 --- a/sys-libs/e2fsprogs-libs/files/e2fsprogs-libs-1.41.0-makefile.patch +++ /dev/null @@ -1,9 +0,0 @@ -Fix the symlinks that submakefiles create so that they don't suck at life. - ---- lib/Makefile.elf-lib -+++ lib/Makefile.elf-lib -@@ -49,3 +49,3 @@ - @echo " SYMLINK $(libdir)/$(ELF_IMAGE).so" -- @$(LN_S) -f $(ELF_INSTALL_DIR)/$(ELF_SONAME) \ -+ @$(LN_S) -f $(ELF_SONAME) \ - $(DESTDIR)$(libdir)/$(ELF_IMAGE).so diff --git a/sys-libs/e2fsprogs-libs/files/e2fsprogs-libs-1.41.0-null-blkid.patch b/sys-libs/e2fsprogs-libs/files/e2fsprogs-libs-1.41.0-null-blkid.patch deleted file mode 100644 index e07c67c493de..000000000000 --- a/sys-libs/e2fsprogs-libs/files/e2fsprogs-libs-1.41.0-null-blkid.patch +++ /dev/null @@ -1,54 +0,0 @@ -commit bb47c2a4aff6ec6b9be7f30cd04cf7c858a84de4 -Author: Theodore Ts'o <tytso@mit.edu> -Date: Sun Jul 13 19:10:10 2008 -0400 - - libblkid: Make sure we never reference a null dev->bid_type - - There were a few places where we don't check to make sure - dev->bid_type is non-NULL before dereferencing the pointer, mostly in - debug code. - - Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> - -diff --git a/lib/blkid/dev.c b/lib/blkid/dev.c -index 770632b..5252a8e 100644 ---- a/lib/blkid/dev.c -+++ b/lib/blkid/dev.c -@@ -34,7 +34,8 @@ void blkid_free_dev(blkid_dev dev) - return; - - DBG(DEBUG_DEV, -- printf(" freeing dev %s (%s)\n", dev->bid_name, dev->bid_type)); -+ printf(" freeing dev %s (%s)\n", dev->bid_name, dev->bid_type ? -+ dev->bid_type : "(null)")); - DBG(DEBUG_DEV, blkid_debug_dump_dev(dev)); - - list_del(&dev->bid_devs); -diff --git a/lib/blkid/devname.c b/lib/blkid/devname.c -index df96859..65c6cca 100644 ---- a/lib/blkid/devname.c -+++ b/lib/blkid/devname.c -@@ -96,7 +96,8 @@ blkid_dev blkid_get_dev(blkid_cache cache, const char *devname, int flags) - dev2 = list_entry(p, struct blkid_struct_dev, bid_devs); - if (dev2->bid_flags & BLKID_BID_FL_VERIFIED) - continue; -- if (strcmp(dev->bid_type, dev2->bid_type)) -+ if (!dev->bid_type || !dev2->bid_type || -+ strcmp(dev->bid_type, dev2->bid_type)) - continue; - if (dev->bid_label && dev2->bid_label && - strcmp(dev->bid_label, dev2->bid_label)) -diff --git a/lib/blkid/save.c b/lib/blkid/save.c -index 76f2f9e..60aa6ce 100644 ---- a/lib/blkid/save.c -+++ b/lib/blkid/save.c -@@ -34,7 +34,8 @@ static int save_dev(blkid_dev dev, FILE *file) - return 0; - - DBG(DEBUG_SAVE, -- printf("device %s, type %s\n", dev->bid_name, dev->bid_type)); -+ printf("device %s, type %s\n", dev->bid_name, dev->bid_type ? -+ dev->bid_type : "(null)")); - - fprintf(file, - "<device DEVNO=\"0x%04lx\" TIME=\"%ld\"", diff --git a/sys-libs/e2fsprogs-libs/files/e2fsprogs-libs-1.41.1-subs.patch b/sys-libs/e2fsprogs-libs/files/e2fsprogs-libs-1.41.1-subs.patch deleted file mode 100644 index ed1852c5f175..000000000000 --- a/sys-libs/e2fsprogs-libs/files/e2fsprogs-libs-1.41.1-subs.patch +++ /dev/null @@ -1,17 +0,0 @@ -http://sourceforge.net/tracker/index.php?func=detail&aid=2087502&group_id=2406&atid=102406 - ---- Makefile.in -+++ Makefile.in -@@ -26,9 +240,9 @@ - $(MAKE) docs - - subs: -- @for i in $(SUBS) ; do if test -d `dirname $$i` ; then $(MAKE) $$i ; fi ; done -- @(test -d lib/et && cd lib/et && $(MAKE) compile_et) -- @(test -d lib/ext2fs && cd lib/ext2fs && $(MAKE) ext2_err.h) -+ for i in $(SUBS) ; do if test -d `dirname $$i` ; then $(MAKE) $$i || exit $$? ; fi ; done -+ if test -d lib/et ; then cd lib/et && $(MAKE) compile_et ; fi -+ if test -d lib/ext2fs ; then cd lib/ext2fs && $(MAKE) ext2_err.h ; fi - - progs: subs all-progs-recursive - libs: subs all-libs-recursive |