diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2012-01-31 19:46:37 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-01-31 19:46:37 +0000 |
commit | a807ae13c9ab4ad3faf71666fdd11dece04fec5d (patch) | |
tree | bac8600a9350535a64212bc6e873ec0b5f6f7a46 /app-arch | |
parent | ppc64 stable wrt #395883 (diff) | |
download | historical-a807ae13c9ab4ad3faf71666fdd11dece04fec5d.tar.gz historical-a807ae13c9ab4ad3faf71666fdd11dece04fec5d.tar.bz2 historical-a807ae13c9ab4ad3faf71666fdd11dece04fec5d.zip |
old
Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64
Diffstat (limited to 'app-arch')
-rw-r--r-- | app-arch/dump/ChangeLog | 9 | ||||
-rw-r--r-- | app-arch/dump/Manifest | 26 | ||||
-rw-r--r-- | app-arch/dump/dump-0.4.41.ebuild | 62 | ||||
-rw-r--r-- | app-arch/dump/dump-0.4.42.ebuild | 66 | ||||
-rw-r--r-- | app-arch/dump/dump-0.4.43.ebuild | 64 | ||||
-rw-r--r-- | app-arch/dump/dump-0.4.44.ebuild | 62 | ||||
-rw-r--r-- | app-arch/dump/files/dump-0.4b43-pkg_config4blkid.patch | 27 | ||||
-rw-r--r-- | app-arch/dump/files/dump-0.4b43-pkg_config4crypto.patch | 50 | ||||
-rw-r--r-- | app-arch/dump/files/dump-0.4b43-pkg_config4ext2fs.patch | 40 |
9 files changed, 16 insertions, 390 deletions
diff --git a/app-arch/dump/ChangeLog b/app-arch/dump/ChangeLog index b0517ff565ad..c9948ec51751 100644 --- a/app-arch/dump/ChangeLog +++ b/app-arch/dump/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-arch/dump # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/dump/ChangeLog,v 1.69 2012/01/31 19:45:14 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/dump/ChangeLog,v 1.70 2012/01/31 19:46:36 ssuominen Exp $ + + 31 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> + -files/dump-0.4b43-pkg_config4blkid.patch, + -files/dump-0.4b43-pkg_config4crypto.patch, + -files/dump-0.4b43-pkg_config4ext2fs.patch, -dump-0.4.41.ebuild, + -dump-0.4.42.ebuild, -dump-0.4.43.ebuild, -dump-0.4.44.ebuild: + old 31 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> dump-0.4.44-r1.ebuild: ppc64 stable wrt #395883 diff --git a/app-arch/dump/Manifest b/app-arch/dump/Manifest index 95bcb459b99c..5a1da016805b 100644 --- a/app-arch/dump/Manifest +++ b/app-arch/dump/Manifest @@ -4,28 +4,18 @@ Hash: SHA1 AUX dump-0.4.44-fix-pointers-aliasing.patch 3887 RMD160 e0dc6478dd7a5a58aa3d1b17f09b8ff085d8bdbc SHA1 72e1581f90c71c63f79f71e620c35679e5726fa2 SHA256 1343ac702165ba52a047002605b9153dae2af26721f229e92eac20bc42b24ebb AUX dump-0.4.44-rl_completion_matches-detection.patch 992 RMD160 6fa03045d6bced0c64b7a1a67ec24e111af2302a SHA1 807ba7fb0df4ae6806ca822fae32eb874b11d869 SHA256 68202abc167ad786ff31e7bfcc0646cb68bd6c0a177a94cb5c52ebf7e8b1c9fe 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 -DIST dump-0.4b41.tar.gz 283204 RMD160 5b2d1594eb390f4d8df6218b42164b4449642a0a SHA1 dc6315d81bc4350bc556e061696a17b16817af16 SHA256 fc03fd74e4d63815e9eda48a069d69f950c44f298830d28eb03e141df6aad4f5 -DIST dump-0.4b42.tar.gz 288636 RMD160 eb22f3360ea0290c3e398c7dbbec4377786755b0 SHA1 73c4995938ab80c1b959f29afe56c21484a38582 SHA256 801def8fb22eddf89801c26a8fcb581d0389a5ad31f2f1d17e5a94fe9e65ac78 -DIST dump-0.4b43.tar.gz 290280 RMD160 f6b145722f0a36f1fc4ce81e940c708c78ddc7a5 SHA1 09dfb24ab3093e95d6d2d57633756d2e2576763b SHA256 424fea1f5f37d01c3fcae2ef23db93f7cce78b072461f74f75f3597df531fd4f DIST dump-0.4b44.tar.gz 296691 RMD160 57d958e41c92da6959647c49faca648c6153850b SHA1 9bef0f86095a9214045b44f5c78efa3fbebcfc58 SHA256 78cb75632ac5e99dca38af3a2574303eee3c5a7af464011d279421d8b0e64f96 -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-r1.ebuild 1775 RMD160 b382a28794210dfbbd4755eea25b7957bfc203bd SHA1 be2eea00ce32ffb7c4a582b18e38e9d0ad6b80b0 SHA256 72edf4928db14b47c67cfbdf8f625f3e2ec44260207e1bde7290fd3f39255929 -EBUILD dump-0.4.44.ebuild 1653 RMD160 007b9670d1ae76efbc62e4c07d36194b51a8537e SHA1 179dd2dd70b0c75d593e1863d511419f365ae0fe SHA256 a897b513b8439e0e234f5f6faf936821049f52efaac5905f8e276ff9fa2d3aea -MISC ChangeLog 9613 RMD160 bfe6d655c03b9e33f02609fc87f94d2fe4d1716d SHA1 e3011fac554712fbba96abaf0e7af7610ec25eb0 SHA256 3846f1addb0a3ae5d70650b26362410535432ccb4c9eeadc684cbe30e3696f71 +MISC ChangeLog 9897 RMD160 fa169c7f5445d6263f3e4cbe1643ee77f501d879 SHA1 0160c4cda44a7cf997c8548fde3e8bee4f380f19 SHA256 5cf7f74f4973d1b539708f7c0bfe3067b236902553daf5c66c07f407f09d6f69 MISC metadata.xml 329 RMD160 d654ea69c621fde34b92f1528f756f6fcefa2667 SHA1 a7b02b19545e8f111ff22182e539db053cbd2d10 SHA256 5d3f3df98b135c307ca92e503e18629f96427b151d669ca3b150da7038eaee2f -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBAgAGBQJPKEQyAAoJEEdUh39IaPFNodgH/1hixcN5TwjzTywdmGJFHWVG -qQ06ixaYDUDev19RHC7CSqMe+Sy0Y2OPRNqLTZk3PIW8Qg04eczAEDB2Y/OaPVew -19ZswCQxmpXGms5VYEAC9Za8Pe1TcMEKVXFuiju0wDfHJjhL/RWFoFEQTlWScE/Q -148AdQMP353OZDPE+F4WBxqKchTqIqbGvl2MvAz2SffR0x6EM+vhmuHofAxrkJLw -PZVoNM5uByUXSxqFw4iFy7TjArZIz7a8dSVM3EE1CbhGxxqsvY1lRpTsm6lfEfIj -edHSg2ESnpk87SH8LkoDs+qn/6rv4mYYIcEy3cARIwK3vOKNq7E4U/B3wDM7/kE= -=+Mm0 +iQEcBAEBAgAGBQJPKESFAAoJEEdUh39IaPFN3swIAI698wbVZQHJkl5y5UM41hom +MGApFEJojyTxZ1+fd8qcdlrNLn8Waoj+3dOaWHJSkano/YqekH4QDrBVXWqTHP/c +2lEOovx3ZOhOjr3IcA9YHaWMzjdN1oR3gbbP+U9OAEstVp+Vjfys7K/gWC8qKmfK +URgriViuJGKLVyMTuutUO+aOe9KnTQs6xXQzcqe6mfHG2UHH0cocJZ58+LyTbjV/ +3F8DhyEnjkvh2y0ZZO9C+FB0AUc6u28J7yls6RvRpNPaL5sDkHpyC9WrZb7iG285 +I9a/kUbVzflPP2r/UcbjX57qh/Pxjb0ZPPnjYgaWgCAWIwql/mYhexVcbP1FbcA= +=wnz6 -----END PGP SIGNATURE----- diff --git a/app-arch/dump/dump-0.4.41.ebuild b/app-arch/dump/dump-0.4.41.ebuild deleted file mode 100644 index fa045fcd8518..000000000000 --- a/app-arch/dump/dump-0.4.41.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/dump/dump-0.4.41.ebuild,v 1.8 2007/12/29 21:53:13 rich0 Exp $ - -MY_P=${P/4./4b} -S=${WORKDIR}/${MY_P} -DESCRIPTION="Dump/restore ext2fs backup utilities" -HOMEPAGE="http://dump.sourceforge.net/" -SRC_URI="mirror://sourceforge/dump/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86" -IUSE="readline static ermt" - -RDEPEND=">=sys-fs/e2fsprogs-1.27 - >=app-arch/bzip2-1.0.2 - >=sys-libs/zlib-1.1.4 - ermt? ( dev-libs/openssl ) - readline? ( sys-libs/readline )" -DEPEND="${RDEPEND} - virtual/os-headers" - -src_unpack() { - unpack ${A} - cd "${S}" - sed -i "s:-ltermcap:-lncurses:g" configure || die -} - -src_compile() { - econf \ - --with-dumpdatespath=/etc/dumpdates \ - --with-{bin,man}owner=root \ - --with-{bin,man}grp=root \ - --enable-largefile \ - $(use_enable ermt) \ - $(use_enable static) \ - $(use_enable readline) \ - || die - emake || die -} - -src_install() { - # built on old autotools, no DESTDIR support - einstall MANDIR="${D}"/usr/share/man/man8 || die - mv "${D}"/usr/sbin/{,dump-}rmt - mv "${D}"/usr/share/man/man8/{,dump-}rmt.8 - use ermt && newsbin rmt/ermt dump-ermt - - dodoc CHANGES KNOWNBUGS MAINTAINERS README REPORTING-BUGS THANKS TODO - cd examples - local d= - for d in * ; do - docinto ${d} - dodoc ${d}/* - done -} - -pkg_postinst() { - ewarn "app-arch/dump installs 'rmt' as 'dump-rmt'." - ewarn "This is to avoid conflicts with app-arch/tar 'rmt'." -} diff --git a/app-arch/dump/dump-0.4.42.ebuild b/app-arch/dump/dump-0.4.42.ebuild deleted file mode 100644 index 10ad383a77a2..000000000000 --- a/app-arch/dump/dump-0.4.42.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/dump/dump-0.4.42.ebuild,v 1.1 2009/09/30 03:14:08 vapier Exp $ - -MY_P=${P/4./4b} -S=${WORKDIR}/${MY_P} -DESCRIPTION="Dump/restore ext2fs backup utilities" -HOMEPAGE="http://dump.sourceforge.net/" -SRC_URI="mirror://sourceforge/dump/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="ermt readline selinux static" - -RDEPEND=">=sys-fs/e2fsprogs-1.27 - >=app-arch/bzip2-1.0.2 - >=sys-libs/zlib-1.1.4 - ermt? ( dev-libs/openssl ) - readline? ( sys-libs/readline )" -DEPEND="${RDEPEND} - virtual/os-headers" - -src_unpack() { - unpack ${A} - cd "${S}" - sed -i \ - -e 's:-ltermcap:-lncurses:g' \ - -e '/BLKID=/s:=.*:=`pkg-config --libs blkid`:' \ - configure || die -} - -src_compile() { - econf \ - --with-dumpdatespath=/etc/dumpdates \ - --with-{bin,man}owner=root \ - --with-{bin,man}grp=root \ - --enable-largefile \ - $(use_enable selinux transselinux) \ - $(use_enable ermt) \ - $(use_enable static) \ - $(use_enable readline) \ - || die - emake || die -} - -src_install() { - # built on old autotools, no DESTDIR support - einstall MANDIR="${D}"/usr/share/man/man8 || die - mv "${D}"/usr/sbin/{,dump-}rmt - mv "${D}"/usr/share/man/man8/{,dump-}rmt.8 - use ermt && newsbin rmt/ermt dump-ermt - - dodoc CHANGES KNOWNBUGS MAINTAINERS README REPORTING-BUGS THANKS TODO - cd examples - local d= - for d in * ; do - docinto ${d} - dodoc ${d}/* - done -} - -pkg_postinst() { - ewarn "app-arch/dump installs 'rmt' as 'dump-rmt'." - ewarn "This is to avoid conflicts with app-arch/tar 'rmt'." -} diff --git a/app-arch/dump/dump-0.4.43.ebuild b/app-arch/dump/dump-0.4.43.ebuild deleted file mode 100644 index 9bc31df3cef1..000000000000 --- a/app-arch/dump/dump-0.4.43.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# 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.43.ebuild,v 1.1 2011/05/23 08:01:26 pva Exp $ - -EAPI="4" -inherit eutils autotools - -MY_P=${P/4./4b} -S=${WORKDIR}/${MY_P} -DESCRIPTION="Dump/restore ext2fs backup utilities" -HOMEPAGE="http://dump.sourceforge.net/" -SRC_URI="mirror://sourceforge/dump/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="debug ermt readline selinux static" - -RDEPEND=">=sys-fs/e2fsprogs-1.27 - >=app-arch/bzip2-1.0.2 - >=sys-libs/zlib-1.1.4 - ermt? ( dev-libs/openssl ) - readline? ( sys-libs/readline - sys-libs/ncurses - static? ( sys-libs/ncurses[static-libs] ) )" -DEPEND="${RDEPEND} - virtual/os-headers" - -src_prepare() { - # https://sourceforge.net/tracker/?func=detail&aid=3306159&group_id=1306&atid=301306 - epatch "${FILESDIR}/dump-0.4b43-pkg_config4blkid.patch" - epatch "${FILESDIR}/dump-0.4b43-pkg_config4ext2fs.patch" - epatch "${FILESDIR}/dump-0.4b43-pkg_config4crypto.patch" - eautoreconf -} - -src_configure() { - econf \ - --with-dumpdatespath=/etc/dumpdates \ - --with-{bin,man}owner=root \ - --with-{bin,man}grp=root \ - --enable-largefile \ - $(use_enable selinux transselinux) \ - $(use_enable ermt) \ - $(use_enable static) \ - $(use_enable readline) \ - $(use_enable debug) -} - -src_install() { - # built on old autotools, no DESTDIR support - einstall MANDIR="${D}"/usr/share/man/man8 - mv "${ED}"/usr/sbin/{,dump-}rmt || die - mv "${ED}"/usr/share/man/man8/{,dump-}rmt.8 || die - use ermt && newsbin rmt/ermt dump-ermt - - dodoc CHANGES KNOWNBUGS MAINTAINERS README REPORTING-BUGS THANKS TODO - dodoc -r examples/* -} - -pkg_postinst() { - ewarn "app-arch/dump installs 'rmt' as 'dump-rmt'." - ewarn "This is to avoid conflicts with app-arch/tar 'rmt'." -} diff --git a/app-arch/dump/dump-0.4.44.ebuild b/app-arch/dump/dump-0.4.44.ebuild deleted file mode 100644 index 72741e15e39c..000000000000 --- a/app-arch/dump/dump-0.4.44.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# 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.2 2011/06/16 09:54:35 pva Exp $ - -EAPI="4" -inherit eutils autotools - -MY_P=${P/4./4b} -S=${WORKDIR}/${MY_P} -DESCRIPTION="Dump/restore ext2fs backup utilities" -HOMEPAGE="http://dump.sourceforge.net/" -SRC_URI="mirror://sourceforge/dump/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="debug ermt readline selinux static" - -RDEPEND=">=sys-fs/e2fsprogs-1.27 - >=app-arch/bzip2-1.0.2 - >=sys-libs/zlib-1.1.4 - ermt? ( dev-libs/openssl ) - readline? ( sys-libs/readline - sys-libs/ncurses - static? ( sys-libs/ncurses[static-libs] ) )" -DEPEND="${RDEPEND} - dev-util/pkgconfig - virtual/os-headers" - -src_prepare() { - epatch "${FILESDIR}/${P}-underlinking.patch" - eautoreconf -} - -src_configure() { - econf \ - --with-dumpdatespath=/etc/dumpdates \ - --with-{bin,man}owner=root \ - --with-{bin,man}grp=root \ - --enable-largefile \ - $(use_enable selinux transselinux) \ - $(use_enable ermt) \ - $(use_enable static) \ - $(use_enable readline) \ - $(use_enable debug) -} - -src_install() { - # built on old autotools, no DESTDIR support - einstall MANDIR="${D}"/usr/share/man/man8 - mv "${ED}"/usr/sbin/{,dump-}rmt || die - mv "${ED}"/usr/share/man/man8/{,dump-}rmt.8 || die - use ermt && newsbin rmt/ermt dump-ermt - - dodoc CHANGES KNOWNBUGS MAINTAINERS README REPORTING-BUGS THANKS TODO - dodoc -r examples/* -} - -pkg_postinst() { - ewarn "app-arch/dump installs 'rmt' as 'dump-rmt'." - ewarn "This is to avoid conflicts with app-arch/tar 'rmt'." -} diff --git a/app-arch/dump/files/dump-0.4b43-pkg_config4blkid.patch b/app-arch/dump/files/dump-0.4b43-pkg_config4blkid.patch deleted file mode 100644 index ad109189ea31..000000000000 --- a/app-arch/dump/files/dump-0.4b43-pkg_config4blkid.patch +++ /dev/null @@ -1,27 +0,0 @@ -=== modified file 'configure.in' ---- configure.in 2011-05-20 04:40:59 +0000 -+++ configure.in 2011-05-20 05:12:18 +0000 -@@ -465,11 +465,17 @@ - dnl Check for blkid headers libraries - dnl - AC_CHECK_HEADER(blkid/blkid.h, [blkid_h=yes], [blkid_h=no], [-]) --AC_CHECK_LIB(blkid, blkid_get_devname, [blkid_lib=yes], [blkid_lib=no], [-luuid]) --if test "$blkid_h" = yes -a "$blkid_lib" = yes; then -- AC_DEFINE([HAVE_BLKID],1,[Define this if you have the blkid library.]) -- BLKID="-lblkid -luuid" --fi -+PKG_CHECK_EXISTS([blkid], -+ [ -+ if test -n $STATIC ; then -+ BLKID=`$PKG_CONFIG --libs --static blkid` -+ else -+ BLKID=`$PKG_CONFIG --libs blkid` -+ fi -+ if test "$blkid_h" = yes ; then -+ AC_DEFINE([HAVE_BLKID],1,[Define this if you have the blkid library.]) -+ fi -+ ],[BLKID=""]) - AC_SUBST(BLKID) - - dnl - diff --git a/app-arch/dump/files/dump-0.4b43-pkg_config4crypto.patch b/app-arch/dump/files/dump-0.4b43-pkg_config4crypto.patch deleted file mode 100644 index d126cf150039..000000000000 --- a/app-arch/dump/files/dump-0.4b43-pkg_config4crypto.patch +++ /dev/null @@ -1,50 +0,0 @@ -=== modified file 'configure.in' ---- configure.in 2011-05-20 09:47:25 +0000 -+++ configure.in 2011-05-20 09:51:37 +0000 -@@ -113,7 +113,6 @@ - if test "$enableval" = "no" - then - ERMT="" -- CRYPTO="" - echo "Not compiling ermt" - else - if test "$RMTDIR" = "" -@@ -121,16 +120,13 @@ - AC_MSG_ERROR(ermt requires --enable-rmt) - fi - ERMT="ermt" -- CRYPTO="-lcrypto" - echo "Compiling ermt" - fi - , - ERMT="" --CRYPTO="" - echo "Not compiling ermt by default" - ) - AC_SUBST(ERMT) --AC_SUBST(CRYPTO) - - dnl - dnl Handle --enable-kerberos -@@ -600,10 +596,19 @@ - if test "$ERMT" != ""; then - AC_CHECK_HEADER(openssl/evp.h, [evp_h=yes], [evp_h=no]) - AC_CHECK_LIB(crypto, EVP_CIPHER_CTX_set_padding, [crypto_lib=yes], [crypto_lib=no]) -- if test "$evp_h" = no -o "$crypto_lib" = no; then -+ PKG_CHECK_EXISTS([libcrypto], -+ [ -+ if test -n $STATIC ; then -+ CRYPTO=`$PKG_CONFIG --libs --static libcrypto` -+ else -+ CRYPTO=`$PKG_CONFIG --libs libcrypto` -+ fi -+ ],[CRYPTO=""]) -+ if test "$evp_h" = no -o "x$CRYPTO" = "x"; then - AC_MSG_ERROR(You need to install the OpenSSL library (version 0.9.7a or later), or configure without --enable-ermt) - fi - fi -+AC_SUBST(CRYPTO) - - dnl - dnl Check for types - diff --git a/app-arch/dump/files/dump-0.4b43-pkg_config4ext2fs.patch b/app-arch/dump/files/dump-0.4b43-pkg_config4ext2fs.patch deleted file mode 100644 index 11ccab9ca20d..000000000000 --- a/app-arch/dump/files/dump-0.4b43-pkg_config4ext2fs.patch +++ /dev/null @@ -1,40 +0,0 @@ -=== modified file 'MCONFIG.in' ---- MCONFIG.in 2011-05-20 04:40:59 +0000 -+++ MCONFIG.in 2011-05-20 06:57:11 +0000 -@@ -32,7 +32,7 @@ - GINC= -I$(top_builddir) -I$(top_srcdir)/compat/include - # indicate where the ext2fs library can be found (this is not needed if you - # have run `make install-libs' in the e2fsprogs source directory). --#GINC+= -I/usr/src/e2fsprogs-0.5c/lib -+GINC+= @EXT2FS_CFLAGS@ - - # - # Global libraries -@@ -40,7 +40,7 @@ - # 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 -lext2fs -lcom_err -+GLIBS= $(GLIBDIR) -L../compat/lib -lcompat @EXT2FS_LIBS@ - - # - # Definitions (don't change them unless you know what you are doing) - -=== modified file 'configure.in' ---- configure.in 2011-05-20 05:16:23 +0000 -+++ configure.in 2011-05-20 07:01:17 +0000 -@@ -411,8 +411,11 @@ - dnl Check for Ext2fs headers and libraries - dnl - AC_CHECK_HEADER(ext2fs/ext2fs.h, [ext2fs_h=yes], [ext2fs_h=no], [-]) --AC_CHECK_LIB(ext2fs, ext2fs_open, [ext2fs_lib=yes], [ext2fs_lib=no], [-lcom_err]) --if test "$ext2fs_h" = no -o "$ext2fs_lib" = no; then -+PKG_CHECK_MODULES(EXT2FS, [ext2fs]) -+if test -n "$STATIC" ; then -+ EXT2FS_LIBS=`$PKG_CONFIG --libs --static ext2fs` -+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 - - |