From ec72958a02f93d532bb4782e9eede0af3964cc35 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 17 Mar 2007 02:22:16 +0000 Subject: [PATCH] no longer need libcom_err.a sanity check since we know com_err-1.39 is not broken #171207 Package-Manager: portage-2.1.2.2 --- sys-fs/e2fsprogs/Manifest | 32 +++++++++---------- sys-fs/e2fsprogs/e2fsprogs-1.39-r1.ebuild | 17 ++-------- sys-fs/e2fsprogs/e2fsprogs-1.39.ebuild | 14 +------- .../files/e2fsprogs-1.39-makefile.patch | 11 ------- 4 files changed, 20 insertions(+), 54 deletions(-) diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest index 2ea3862d93f0..000ffa57e0a2 100644 --- a/sys-fs/e2fsprogs/Manifest +++ b/sys-fs/e2fsprogs/Manifest @@ -25,10 +25,10 @@ AUX e2fsprogs-1.39-libintl.patch 349 RMD160 af61d02d49ca9653c01c3b318a22adcff520 MD5 f2055563a3d07e89731cb194126c6d66 files/e2fsprogs-1.39-libintl.patch 349 RMD160 af61d02d49ca9653c01c3b318a22adcff5202746 files/e2fsprogs-1.39-libintl.patch 349 SHA256 d78ef6bc941230136b5b8e877364e7d8c5cdfa476b27d2931798bdfd485125f2 files/e2fsprogs-1.39-libintl.patch 349 -AUX e2fsprogs-1.39-makefile.patch 2969 RMD160 8941653c04c5922fa5adfa7fb3546369e0f93cf7 SHA1 036d811125e898c04d277d882949a4b2d886b829 SHA256 7b5cd384581337c82c505ca81d579a342ac61e4966425507d509cbf1606218f3 -MD5 35c16fb6fde211dd79c6bd43df64ff96 files/e2fsprogs-1.39-makefile.patch 2969 -RMD160 8941653c04c5922fa5adfa7fb3546369e0f93cf7 files/e2fsprogs-1.39-makefile.patch 2969 -SHA256 7b5cd384581337c82c505ca81d579a342ac61e4966425507d509cbf1606218f3 files/e2fsprogs-1.39-makefile.patch 2969 +AUX e2fsprogs-1.39-makefile.patch 2646 RMD160 5e5dca19f977c56d516ab1df3bf65700d870425a SHA1 9e6e7f5228dc15b458af0346827474376ea89f3a SHA256 b9d6876b76f36e873295e1ad7301d86dc00d7f2adab0743de57be9adf1578f9a +MD5 563afe8d7066693b54647bc3c82eaee0 files/e2fsprogs-1.39-makefile.patch 2646 +RMD160 5e5dca19f977c56d516ab1df3bf65700d870425a files/e2fsprogs-1.39-makefile.patch 2646 +SHA256 b9d6876b76f36e873295e1ad7301d86dc00d7f2adab0743de57be9adf1578f9a files/e2fsprogs-1.39-makefile.patch 2646 AUX e2fsprogs-1.39-parse-types.patch 1117 RMD160 5858224739c494ae2e31507b217594cd1bf0440f SHA1 fa6ff6f281dca7d14e946df39c9b30a9faa14565 SHA256 f5741d617739d3e04e516bb0c22f385bdc01f598d181c50247f30cb4442d4fdd MD5 29853daadd9ea0d27abcc57e46d48e25 files/e2fsprogs-1.39-parse-types.patch 1117 RMD160 5858224739c494ae2e31507b217594cd1bf0440f files/e2fsprogs-1.39-parse-types.patch 1117 @@ -39,14 +39,14 @@ RMD160 04d8e04d5e04f9a927a76b36a072c50fb80eae84 files/e2fsprogs-1.39-util-strpti SHA256 fa300c80bbd679967ff74c361b63a9610f911b0916eff38fd491b797c0ff99c5 files/e2fsprogs-1.39-util-strptime.patch 178 DIST e2fsprogs-1.39.tar.gz 3695111 RMD160 67e77a7cbf0e719fa8b5a8ac6285b334e1c3481b SHA1 c2dad0c9bd76701eafe3804e2a7d072aa198f046 SHA256 dc2033447e69a1612881151f6f163e8a3b80e51d16f5e8b3576f3f8ccb325ea3 DIST ext4-e2fsprogs-1.39.patch.tar 716800 RMD160 5b20e7f2133e7339d22ee85d39c92cd7af920bb9 SHA1 fce15f60164a6c067c0d5a50cf00d4716e9a4f92 SHA256 0472210d002808f1505f96b1ca0e667f3cc2a6d585bca7d9a00130d6fe0ca38e -EBUILD e2fsprogs-1.39-r1.ebuild 4424 RMD160 a3f2e01fdc290c67c5d63ef3904de14b6e03ab32 SHA1 6763474de5c237de8793bea52b2956be5d712fb4 SHA256 afc3cc3d1e00fac64c2b99c624ebc957611a77ecf83360ca0de7fe6d3e6c4e4b -MD5 163869eeac06a292d91f31443fc30af3 e2fsprogs-1.39-r1.ebuild 4424 -RMD160 a3f2e01fdc290c67c5d63ef3904de14b6e03ab32 e2fsprogs-1.39-r1.ebuild 4424 -SHA256 afc3cc3d1e00fac64c2b99c624ebc957611a77ecf83360ca0de7fe6d3e6c4e4b e2fsprogs-1.39-r1.ebuild 4424 -EBUILD e2fsprogs-1.39.ebuild 4141 RMD160 5f90fae381443c034a41780c60022ed222b24dad SHA1 32a2e489712a128c26d56cf996d3d3fcaaa03f4d SHA256 1e74cf68c3505cb180fe4f84c04108132612df0d12827a2de3664d1615c95102 -MD5 ade8d4226efba62853b80a0f638f7d23 e2fsprogs-1.39.ebuild 4141 -RMD160 5f90fae381443c034a41780c60022ed222b24dad e2fsprogs-1.39.ebuild 4141 -SHA256 1e74cf68c3505cb180fe4f84c04108132612df0d12827a2de3664d1615c95102 e2fsprogs-1.39.ebuild 4141 +EBUILD e2fsprogs-1.39-r1.ebuild 4115 RMD160 eb3f439c3f2174fa506cf5fa3efcc53a6e22303f SHA1 b4081122c69c6f41530bd709859c6f66b0b7c420 SHA256 016d47be1c93ef2447659c4ae5b619bd08977bb8b246c60b0fc6361b1a25bc8c +MD5 47e43e5f622bfaa7dbcabe8dc73459c0 e2fsprogs-1.39-r1.ebuild 4115 +RMD160 eb3f439c3f2174fa506cf5fa3efcc53a6e22303f e2fsprogs-1.39-r1.ebuild 4115 +SHA256 016d47be1c93ef2447659c4ae5b619bd08977bb8b246c60b0fc6361b1a25bc8c e2fsprogs-1.39-r1.ebuild 4115 +EBUILD e2fsprogs-1.39.ebuild 3773 RMD160 d86bd1048293be54efaba2b121cb66199b6bffab SHA1 3207da1989239265d11b0b9f91d7374731bbca22 SHA256 27ffaf0ad7faad5b2de8bf490f56cd377b292b434f3e003f6f2b6b80a523c123 +MD5 9cde58b75db8e27a56c692484c95a839 e2fsprogs-1.39.ebuild 3773 +RMD160 d86bd1048293be54efaba2b121cb66199b6bffab e2fsprogs-1.39.ebuild 3773 +SHA256 27ffaf0ad7faad5b2de8bf490f56cd377b292b434f3e003f6f2b6b80a523c123 e2fsprogs-1.39.ebuild 3773 MISC ChangeLog 15751 RMD160 4fe626f596e86600ea57498c7c74d904100be31f SHA1 3d33b8cde2c4e2e70fe2091bc1465a0fbf5253cb SHA256 400fbbfaa56a8aeea4b26d75ec6941c42cd9ce5a821e7523451a054ccf12dad0 MD5 4927e244d0e0dab7f76804eb94200961 ChangeLog 15751 RMD160 4fe626f596e86600ea57498c7c74d904100be31f ChangeLog 15751 @@ -62,9 +62,9 @@ MD5 b9dfcbb27ee58be28e401b8a17bccc0d files/digest-e2fsprogs-1.39-r1 515 RMD160 7b999a2cd6bb72521fedc467433e23f7d9bde740 files/digest-e2fsprogs-1.39-r1 515 SHA256 031d234c293c7df0edc6d603c55f54ee8880a322532f0a2c7f98877e2eae189a files/digest-e2fsprogs-1.39-r1 515 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.1 (GNU/Linux) +Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFFuoN/8bi6rjpTunYRAhAJAJ9wVje3CwFuzXTpUKO+GyB8QvKGOQCgquQw -/LiJuUXO+9gxIQXwkpUjN+0= -=hIJW +iD8DBQFF+1Dw8bi6rjpTunYRAh5fAKCbJUmIyQTPtVvOEJGNJ7nzGOUjYwCfSDaW +SKbWVnpRmIYMkl96i2B5G+Q= +=JVNN -----END PGP SIGNATURE----- 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* -- 2.26.2