e2fsprogs-libs: missing USE uclibc

5 files changed, 147 insertions, 0 deletions

diff --git a/sys-libs/e2fsprogs-libs/Manifest b/sys-libs/e2fsprogs-libs/Manifest
new file mode 100644
index 00000000..5829c8b2
--- /dev/null
+++ b/sys-libs/e2fsprogs-libs/Manifest
@@ -0,0 +1,5 @@
+AUX e2fsprogs-libs-1.41.0-makefile.patch 307 RMD160 1d0e083be1515512a1ebba6943ad5c6adcbe5efd SHA1 3a9e057d5b9e012eaa885db3ce83658a66ee7b4f SHA256 4a844e8ebb82fbaf528280b915067045b9906b423a6a9f3ef38046ade3667fd5
+AUX e2fsprogs-libs-1.41.0-null-blkid.patch 1920 RMD160 e946fb72fb0e929edb7286f4a7db8723fc33fb1b SHA1 672d4c29c59f5ef3bdfa75097031cad4be124ab7 SHA256 a62abfb3fac1fa8424a604afab6928f083862134ab23147f08c3a8befa70e1f1
+AUX e2fsprogs-libs-1.41.1-subs.patch 660 RMD160 7d78dd58673d3e30e848aaa397abd03018416a13 SHA1 26f11971f209cda0da2e152d40e510724a17d620 SHA256 f0cf54041dc60001eeb9259973a3fbd19fc4fa91c7e9a3b378033e71d1cc2c58
+DIST e2fsprogs-libs-1.41.3.tar.gz 489551 RMD160 73ec32fd8ed9869f5b1350cf85adcc51cc15c0dd SHA1 c1c24e9059a34a6f40b92902211d12bab8c39763 SHA256 38b8163595da62f740b62bf4e77bbe5429cd78303f5fbdc260122d25d3a3300c
+EBUILD e2fsprogs-libs-1.41.3-r1.ebuild 1581 RMD160 3afca9d15d482240ee61dee46627968e7616d47f SHA1 5d3e83242ff4ff981dd857e33ff9f49e538a05a7 SHA256 67026b3b30b66d8de1055dfa54d08479e4f107f9fb7f5551282b53d4116a6c80
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.41.3-r1.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.41.3-r1.ebuild
new file mode 100644
index 00000000..b46afc7d
--- /dev/null
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.41.3-r1.ebuild
@@ -0,0 +1,62 @@
+# 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-r1.ebuild,v 1.1 2008/12/30 20:45:31 pchrist Exp $
+
+inherit flag-o-matic toolchain-funcs
+
+EAPI="2"
+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 elibc_uclibc"
+
+RDEPEND="!sys-libs/com_err
+	!sys-libs/ss
+	!<sys-fs/e2fsprogs-1.41"
+DEPEND="nls? ( sys-devel/gettext )
+	sys-devel/bc"
+
+src_configure() {
+	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
+
+}
+
+src_compile() {
+	export LDCONFIG=/bin/true
+	export CC=$(tc-getCC)
+	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
new file mode 100644
index 00000000..f96dd89c
--- /dev/null
+++ b/sys-libs/e2fsprogs-libs/files/e2fsprogs-libs-1.41.0-makefile.patch
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000..e07c67c4
--- /dev/null
+++ b/sys-libs/e2fsprogs-libs/files/e2fsprogs-libs-1.41.0-null-blkid.patch
@@ -0,0 +1,54 @@
+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
new file mode 100644
index 00000000..ed1852c5
--- /dev/null
+++ b/sys-libs/e2fsprogs-libs/files/e2fsprogs-libs-1.41.1-subs.patch
@@ -0,0 +1,17 @@
+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