no longer need libcom_err.a sanity check since we know com_err-1.39 is not broken #171207

(Portage version: 2.1.2.2)

3 files changed, 4 insertions, 38 deletions

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.39-r1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.39-r1.ebuild
index 16246e2fb751..18ff7971d5c7 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.39-r1.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.39-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.39-r1.ebuild,v 1.2 2007/01/17 03:50:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.39-r1.ebuild,v 1.3 2007/03/17 02:22:16 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -21,18 +21,6 @@ DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 	sys-apps/texinfo"
 
-pkg_setup() {
-	# sanity check for #125146
-	if [[ -L ${ROOT}/usr/$(get_libdir)/libcom_err.a ]] || \
-	   [[ ! -e ${ROOT}/usr/$(get_libdir)/libcom_err.a ]]
-	then
-		rm -f "${ROOT}"/usr/$(get_libdir)/libcom_err.a
-		eerror "Your libcom_err.a is broken, please re-emerge com_err:"
-		eerror "  # emerge com_err"
-		die "Mr. T pities the fool with a broken libcom_err.a"
-	fi
-}
-
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
@@ -104,7 +92,7 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install || die
 	dodoc ChangeLog README RELEASE-NOTES SHLIBS
 	docinto e2fsck
 	dodoc e2fsck/ChangeLog e2fsck/CHANGES
@@ -121,6 +109,7 @@ src_install() {
 		gen_usr_ldscript ${x} || die "gen ldscript ${x}"
 	done
 
+	ln -s libext2fs.info.gz  $D/usr/share/info/booga.info.gz
 	# move 'useless' stuff to /usr/
 	dosbin "${D}"/sbin/mklost+found
 	rm -f "${D}"/sbin/mklost+found
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.39.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.39.ebuild
index 264e2c1e289a..be5537b82504 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.39.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.39.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.39.ebuild,v 1.4 2006/12/10 00:39:19 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.39.ebuild,v 1.5 2007/03/17 02:22:16 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -20,18 +20,6 @@ DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 	sys-apps/texinfo"
 
-pkg_setup() {
-	# sanity check for #125146
-	if [[ -L ${ROOT}/usr/$(get_libdir)/libcom_err.a ]] || \
-	   [[ ! -e ${ROOT}/usr/$(get_libdir)/libcom_err.a ]]
-	then
-		rm -f "${ROOT}"/usr/$(get_libdir)/libcom_err.a
-		eerror "Your libcom_err.a is broken, please re-emerge com_err:"
-		eerror "  # emerge com_err"
-		die "Mr. T pities the fool with a broken libcom_err.a"
-	fi
-}
-
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.39-makefile.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.39-makefile.patch
index 3be480bac44a..4eaebba15d23 100644
--- a/sys-fs/e2fsprogs/files/e2fsprogs-1.39-makefile.patch
+++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.39-makefile.patch
@@ -70,14 +70,3 @@
 -	@$(LN_S) -f $(ELF_INSTALL_DIR)/$(ELF_SONAME) \
 +	@$(LN_S) -f $(ELF_SONAME) \
  		$(DESTDIR)$(libdir)/$(ELF_IMAGE).so
---- doc/Makefile.in
-+++ doc/Makefile.in
-@@ -26,8 +26,6 @@
- 		echo "	INSTALL_DATA $(infodir)/$$i" ; \
- 		$(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i ; \
- 	done
--	@echo "	GZIP $(infodir)/libext2fs.info*"
--	@gzip -9 $(DESTDIR)$(infodir)/libext2fs.info*
- 
- uninstall-doc-libs:
- 	$(RM) -rf $(DESTDIR)$(infodir)/libext2fs.info*