Version bump.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 10 insertions, 71 deletions

diff --git a/app-arch/libarchive/ChangeLog b/app-arch/libarchive/ChangeLog
index 478048b9d8a9..50758820b62a 100644
--- a/app-arch/libarchive/ChangeLog
+++ b/app-arch/libarchive/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-arch/libarchive
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/ChangeLog,v 1.78 2010/03/07 18:18:32 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/ChangeLog,v 1.79 2010/03/15 14:03:59 flameeyes Exp $
+
+*libarchive-2.8.3 (15 Mar 2010)
+
+  15 Mar 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -libarchive-2.8.1.ebuild, -files/libarchive-2.8.1+openssl.patch,
+  +libarchive-2.8.3.ebuild:
+  Version bump.
 
 *libarchive-2.8.1 (07 Mar 2010)
 
diff --git a/app-arch/libarchive/files/libarchive-2.8.1+openssl.patch b/app-arch/libarchive/files/libarchive-2.8.1+openssl.patch
deleted file mode 100644
index 895fcbcd564a..000000000000
--- a/app-arch/libarchive/files/libarchive-2.8.1+openssl.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-commit 18311d1be81d93350a406b641d501e3ced5a2662
-Author: joerg.sonnenberger <joerg.sonnenberger@2e22974a-a639-11dd-bc7a-dd6b2ed99ab5>
-Date:   Sun Feb 21 14:23:09 2010 +0000
-
-    Improve detection of SHA2 functions in OpenSSL to deal with ancient
-    versions like in Mac OS X and FreeBSD 6.x. Fixes #65 and should fix #55.
-    
-    
-    git-svn-id: http://libarchive.googlecode.com/svn/trunk@1940 2e22974a-a639-11dd-bc7a-dd6b2ed99ab5
-
-diff --git a/configure.ac b/configure.ac
-index 45960ad..921ed87 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -281,30 +281,34 @@ if test "x$with_openssl" != "xno"; then
-     AC_CHECK_HEADERS([openssl/sha.h])
-     AC_SEARCH_LIBS([SHA1_Init], [crypto])
-   fi
--  if test "$ac_cv_func_SHA256Init" != "yes" ||
--     test "$ac_cv_func_SHA384Init" != "yes" ||
--     test "$ac_cv_func_SHA512Init" != "yes"; then
--    if test "$ac_cv_func_SHA256_Init" != "yes" ||
--       test "$ac_cv_func_SHA384_Init" != "yes" ||
--       test "$ac_cv_func_SHA512_Init" != "yes"; then
--      AC_CHECK_HEADERS([openssl/sha.h])
--      # TODO: Does AC_SEARCH_LIBS support more than one function at once?
--      #       This appears to always fail.
--      AC_SEARCH_LIBS([SHA256_Init SHA384_Init SHA512_Init], [crypto])
--
--      # TODO: Actually test for these.  Previously our C code did not
--      # test for these at all and just assumed availability.  Now that
--      # the C code tests these macros we preserve previous behavior
--      # for the autotools build by hard-coding availability.
--      if test "$ac_cv_header_openssl_sha_h" = "yes"; then
-+
-+  AC_CHECK_HEADERS([openssl/sha.h])
-+  if test "$ac_cv_func_SHA256Init" != "yes" &&
-+    test "$ac_cv_func_SHA256_Init" != "yes"; then
-+      AC_SEARCH_LIBS([SHA256_Init], [crypto])
-+      if test "$ac_cv_func_SHA256_Init" = "yes" &&
-+        test "$ac_cv_header_openssl_sha_h" = "yes"; then
-         AC_DEFINE(HAVE_OPENSSL_SHA256_INIT, 1,
- 	  [Define to 1 if your openssl has the `SHA256_Init' function.])
-+      fi
-+  fi
-+  if test "$ac_cv_func_SHA384Init" != "yes" &&
-+    test "$ac_cv_func_SHA384_Init" != "yes"; then
-+      AC_SEARCH_LIBS([SHA384_Init], [crypto])
-+      if test "$ac_cv_func_SHA384_Init" = "yes" &&
-+        test "$ac_cv_header_openssl_sha_h" = "yes"; then
-         AC_DEFINE(HAVE_OPENSSL_SHA384_INIT, 1,
- 	  [Define to 1 if your openssl has the `SHA384_Init' function.])
-+      fi
-+  fi
-+  if test "$ac_cv_func_SHA512Init" != "yes" &&
-+    test "$ac_cv_func_SHA512_Init" != "yes"; then
-+      AC_SEARCH_LIBS([SHA512_Init], [crypto])
-+      if test "$ac_cv_func_SHA512_Init" = "yes" &&
-+        test "$ac_cv_header_openssl_sha_h" = "yes"; then
-         AC_DEFINE(HAVE_OPENSSL_SHA512_INIT, 1,
- 	  [Define to 1 if your openssl has the `SHA512_Init' function.])
-       fi
--    fi
-   fi
- fi
- 
diff --git a/app-arch/libarchive/libarchive-2.8.1.ebuild b/app-arch/libarchive/libarchive-2.8.3.ebuild
index 15550e007302..4512ad6b723c 100644
--- a/app-arch/libarchive/libarchive-2.8.1.ebuild
+++ b/app-arch/libarchive/libarchive-2.8.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/libarchive-2.8.1.ebuild,v 1.1 2010/03/07 18:18:32 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/libarchive-2.8.3.ebuild,v 1.1 2010/03/15 14:03:59 flameeyes Exp $
 
 EAPI="2"
 
-inherit eutils libtool toolchain-funcs flag-o-matic autotools
+inherit eutils libtool toolchain-funcs flag-o-matic
 
 DESCRIPTION="BSD tar command"
 HOMEPAGE="http://people.freebsd.org/~kientzle/libarchive"
@@ -31,8 +31,6 @@ DEPEND="${RDEPEND}
 		virtual/os-headers )"
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}+openssl.patch"
-	eautoreconf
 	elibtoolize
 	epunt_cxx
 }