Fix underlinking build problem, bug #369461 thank Diego Elio Pettenò for report.

Package-Manager: portage-2.1.10.3/cvs/Linux x86_64

4 files changed, 47 insertions, 15 deletions

diff --git a/app-arch/dump/ChangeLog b/app-arch/dump/ChangeLog
index 6bfb38772157..e10b69d93777 100644
--- a/app-arch/dump/ChangeLog
+++ b/app-arch/dump/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-arch/dump
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/dump/ChangeLog,v 1.62 2011/06/14 14:51:59 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dump/ChangeLog,v 1.63 2011/06/16 09:54:35 pva Exp $
+
+  16 Jun 2011; Peter Volkov <pva@gentoo.org> dump-0.4.44.ebuild,
+  +files/dump-0.4.44-underlinking.patch:
+  Fix underlinking build problem, bug #369461 thank Diego Elio Pettenò for
+  report.
 
 *dump-0.4.44 (14 Jun 2011)
 
diff --git a/app-arch/dump/Manifest b/app-arch/dump/Manifest
index 6dae8d5bc526..cb540e7b1477 100644
--- a/app-arch/dump/Manifest
+++ b/app-arch/dump/Manifest
@@ -1,6 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX dump-0.4.44-underlinking.patch 1259 RMD160 84741cb856d74ea9d281119bcadd821c241cc6b4 SHA1 d162ff275e6aebe6c030afcb51e568302f94ffb7 SHA256 5ed784b91dd7aae4a93470c093ef27abb65fe3b4a75e912acb4d70ce7bfb24d1
 AUX dump-0.4b43-pkg_config4blkid.patch 796 RMD160 5d99f420a3ab38d050b7f60655130f4fbd775c8e SHA1 0cbfa6f0d7c513110cc2fad499c6a35cd6265bff SHA256 59b0b2a70cae1d6fcaf13330ef12b26afff291d691439b502a723ce28ede83d5
 AUX dump-0.4b43-pkg_config4crypto.patch 1186 RMD160 1f3f998e3ce81ac4681ff1b8c28f94be365f3511 SHA1 e468b6c64479b15ac73d6a3af5cde24fbd928ed2 SHA256 b684000795e2f261cce4bb5bf8c5a1140ccfee306326049a0d040e627d475b93
 AUX dump-0.4b43-pkg_config4ext2fs.patch 1528 RMD160 563a90550bdb06412d4048fe36e065b3853a3d81 SHA1 ecafba8909606eeca770fcd25ffa3dc31ca7b575 SHA256 f31e87810d6f6928315899e34148ecb666a20703b96ba60b8ae9da5e03df7720
@@ -11,13 +9,6 @@ DIST dump-0.4b44.tar.gz 296691 RMD160 57d958e41c92da6959647c49faca648c6153850b S
 EBUILD dump-0.4.41.ebuild 1537 RMD160 7520da93f9a56f354a6d3ad7af48313b51b52114 SHA1 d997db65259b34fa11e62e5b9a5d6bee62fd3d20 SHA256 1f938f6d8c803d887c84db77386ec99425a6878301c83be55c659fd351d465ac
 EBUILD dump-0.4.42.ebuild 1654 RMD160 a09ffd1855f70fc1bb54fe22d686515fd12ccfc8 SHA1 12bded15141a8d0f213b2ea6e7f3102c18b96961 SHA256 227b1628059896faa8cde334fb3e26b5fe9cf2b0ac17caa7ff9ffd6de0cbb429
 EBUILD dump-0.4.43.ebuild 1846 RMD160 e7f03a829f5486801e7cc84fd1ac2a894ab56dbd SHA1 d6e9ec9b325748d7102bb7ec76246bc6ca124f88 SHA256 391b6d60e0b768b7961aeba9b077ca6865e0004df52776b522403fbb1b5c7d67
-EBUILD dump-0.4.44.ebuild 1565 RMD160 9f403efd89c70c5b6bec072e5ed9e891e90b15a2 SHA1 221aaa48f968f76b8ae1dfa80699d82216015e35 SHA256 69b360487e93e29455e41e0e6590b09b208a09c290fd3bfd0262b8fdb62a572b
-MISC ChangeLog 8592 RMD160 13f1751612425f699d11dc6212aeddd58c83b0fe SHA1 953a55cbdb3cd9e3b03937d7f1bab4d448373be6 SHA256 5ad590d97d9ae53310939fa5ddfa0cd8cc7dae149215d949c877c5c7104cef66
+EBUILD dump-0.4.44.ebuild 1653 RMD160 007b9670d1ae76efbc62e4c07d36194b51a8537e SHA1 179dd2dd70b0c75d593e1863d511419f365ae0fe SHA256 a897b513b8439e0e234f5f6faf936821049f52efaac5905f8e276ff9fa2d3aea
+MISC ChangeLog 8785 RMD160 770bf382c0beb9ef6b51bbed9de67bf17e71f8f8 SHA1 45efc1c28eae74e51a2c635bebc858fcd1492ff2 SHA256 f10650b003ab8951975678c9bc0dc120cd34c096e005215976b46e4c44cb8e52
 MISC metadata.xml 329 RMD160 d654ea69c621fde34b92f1528f756f6fcefa2667 SHA1 a7b02b19545e8f111ff22182e539db053cbd2d10 SHA256 5d3f3df98b135c307ca92e503e18629f96427b151d669ca3b150da7038eaee2f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk33dZUACgkQVWmRsqeSphOVwwCcDl8o6yohB4HBH0ms5eS4+igo
-caEAn3FGtSsFYdPZznzvJVPA4FLPRONJ
-=DPhB
------END PGP SIGNATURE-----
diff --git a/app-arch/dump/dump-0.4.44.ebuild b/app-arch/dump/dump-0.4.44.ebuild
index 553197f5fd33..72741e15e39c 100644
--- a/app-arch/dump/dump-0.4.44.ebuild
+++ b/app-arch/dump/dump-0.4.44.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/dump/dump-0.4.44.ebuild,v 1.1 2011/06/14 14:51:59 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dump/dump-0.4.44.ebuild,v 1.2 2011/06/16 09:54:35 pva Exp $
 
 EAPI="4"
-inherit eutils
+inherit eutils autotools
 
 MY_P=${P/4./4b}
 S=${WORKDIR}/${MY_P}
@@ -27,6 +27,11 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	virtual/os-headers"
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-underlinking.patch"
+	eautoreconf
+}
+
 src_configure() {
 	econf \
 		--with-dumpdatespath=/etc/dumpdates \
diff --git a/app-arch/dump/files/dump-0.4.44-underlinking.patch b/app-arch/dump/files/dump-0.4.44-underlinking.patch
new file mode 100644
index 000000000000..b211f0079769
--- /dev/null
+++ b/app-arch/dump/files/dump-0.4.44-underlinking.patch
@@ -0,0 +1,31 @@
+diff --git a/MCONFIG.in b/MCONFIG.in
+index 64cb016..f5d1012 100644
+--- a/MCONFIG.in
++++ b/MCONFIG.in
+@@ -40,7 +40,7 @@ GINC+=		@EXT2FS_CFLAGS@
+ # indicate where the ext2fs library can be found (this is not needed if you
+ # have run `make install-libs' in the e2fsprogs source directory).
+ #GLIBDIR=	-L/usr/src/e2fsprogs-0.5c/lib
+-GLIBS=		$(GLIBDIR) -L../compat/lib -lcompat @EXT2FS_LIBS@
++GLIBS=		$(GLIBDIR) -L../compat/lib -lcompat @EXT2FS_LIBS@ @COM_ERR_LIBS@
+ 
+ #
+ # Definitions (don't change them unless you know what you are doing)
+diff --git a/configure.in b/configure.in
+index 2d69157..c8a9e04 100644
+--- a/configure.in
++++ b/configure.in
+@@ -414,11 +414,12 @@ fi
+ if test "$ext2fs_h" = no -o "x$EXT2FS_LIBS" = "x"; then
+ 	AC_MSG_ERROR(You need to install the Ext2fs libraries from the E2fsprogs distribution first - hint: make install-libs)
+ fi
++PKG_CHECK_MODULES(COM_ERR, [com_err])
+ 
+ dnl
+ dnl Check for ext2fs_read_inode_full
+ dnl
+-AC_CHECK_LIB(ext2fs, ext2fs_read_inode_full, [rif=yes], [rif=no], [-lcom_err])
++AC_CHECK_LIB(ext2fs, ext2fs_read_inode_full, [rif=yes], [rif=no], [$COM_ERR_LIBS])
+ if test "$rif" = yes; then
+ 	AC_DEFINE([HAVE_EXT2FS_READ_INODE_FULL],1,[Define this if your ext2fs libs have the ext2fs_read_inode_full function.])
+ fi