Fix automagic libacl and libbz2 linking; amd64 stable.

(Portage version: 2.1.5)

4 files changed, 72 insertions, 28 deletions

diff --git a/app-arch/xar/ChangeLog b/app-arch/xar/ChangeLog
index ebca5ea5ee96..f097d554c982 100644
--- a/app-arch/xar/ChangeLog
+++ b/app-arch/xar/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-arch/xar
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/xar/ChangeLog,v 1.14 2008/04/21 16:29:01 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/xar/ChangeLog,v 1.15 2008/05/19 15:17:30 drac Exp $
+
+  19 May 2008; Samuli Suominen <drac@gentoo.org>
+  +files/xar-1.5.2-automagic_acl_and_bzip2.patch, -xar-1.5.1.ebuild,
+  xar-1.5.2.ebuild:
+  Fix automagic libacl and libbz2 linking; amd64 stable.
 
   21 Apr 2008; Christian Heim <phreak@gentoo.org> metadata.xml:
   Fix up metadata.xml. If there's no maintainer for the package, the metadata
diff --git a/app-arch/xar/files/xar-1.5.2-automagic_acl_and_bzip2.patch b/app-arch/xar/files/xar-1.5.2-automagic_acl_and_bzip2.patch
new file mode 100644
index 000000000000..54ad8f725314
--- /dev/null
+++ b/app-arch/xar/files/xar-1.5.2-automagic_acl_and_bzip2.patch
@@ -0,0 +1,46 @@
+diff -ur xar-1.5.2.orig/configure.ac xar-1.5.2/configure.ac
+--- xar-1.5.2.orig/configure.ac	2007-12-29 20:49:57.000000000 +0200
++++ xar-1.5.2/configure.ac	2008-05-19 17:07:23.000000000 +0300
+@@ -181,8 +181,13 @@
+ )
+ AC_SUBST([enable_autogen])
+ 
++AC_ARG_ENABLE(acl, AC_HELP_STRING([--disable-acl], [disable support for libacl (default=autodetect)]), [ enable_acl=$enableval ], [ enable_acl=yes ])
++
++if test "x$enable_acl" = "xyes"; then
+ AC_TRY_COMPILE([#include <sys/types.h>
+ #include <sys/acl.h>], [acl_t a], [AC_DEFINE([HAVE_SYS_ACL_H],[1], [define if you have sys/acl.h and it has a working acl_t type])])
++fi
++
+ AC_CHECK_HEADERS(ext2fs/ext2_fs.h sys/statfs.h sys/xattr.h sys/param.h sys/extattr.h libutil.h)
+ AC_CHECK_FUNCS(lgetxattr)
+ AC_CHECK_FUNCS(lsetxattr)
+@@ -251,7 +256,9 @@
+ AC_ERROR(can not detect the size of your system's dev_t type)
+ fi
+ 
+-AC_CHECK_LIB(acl, acl_get_file)
++if test "x$enable_acl" = "xyes"; then
++  AC_CHECK_LIB(acl, acl_get_file)
++fi
+ 
+ dnl Check for paths
+ AC_PREFIX_DEFAULT(/usr/local)
+@@ -342,9 +349,14 @@
+ dnl 
+ dnl Configure libbz2.
+ dnl 
+-have_libbz2="1"
+-AC_CHECK_HEADERS([bzlib.h], , [have_libbz2="0"])
+-AC_CHECK_LIB([bz2], [BZ2_bzCompress], , [have_libbz2="0"])
++AC_ARG_ENABLE(bzip2, AC_HELP_STRING([--disable-bzip2], [disable support for libbz2 (default=autodetect)]), [ enable_bzip2=$enableval ], [ enable_bzip2=yes ])
++
++if test "x$enable_bzip2" = "xyes"; then
++  have_libbz2="1"
++  AC_CHECK_HEADERS([bzlib.h], , [have_libbz2="0"])
++  AC_CHECK_LIB([bz2], [BZ2_bzCompress], , [have_libbz2="0"])
++fi
++
+ if test "x${have_libbz2}" = "x1" ; then
+   AC_DEFINE([HAVE_LIBBZ2])
+ fi
diff --git a/app-arch/xar/xar-1.5.1.ebuild b/app-arch/xar/xar-1.5.1.ebuild
deleted file mode 100644
index c984030f5b23..000000000000
--- a/app-arch/xar/xar-1.5.1.ebuild
+++ /dev/null
@@ -1,21 +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/xar/xar-1.5.1.ebuild,v 1.4 2007/12/10 17:27:40 jer Exp $
-
-DESCRIPTION="an easily extensible archive format"
-HOMEPAGE="http://code.google.com/p/xar"
-SRC_URI="http://xar.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-# this also has optional acl/bzip2 linkage ...
-DEPEND="dev-libs/openssl
-	dev-libs/libxml2
-	sys-libs/zlib"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-}
diff --git a/app-arch/xar/xar-1.5.2.ebuild b/app-arch/xar/xar-1.5.2.ebuild
index 256ca538793d..17eec717b7f7 100644
--- a/app-arch/xar/xar-1.5.2.ebuild
+++ b/app-arch/xar/xar-1.5.2.ebuild
@@ -1,23 +1,37 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/xar/xar-1.5.2.ebuild,v 1.1 2008/01/29 22:45:56 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/xar/xar-1.5.2.ebuild,v 1.2 2008/05/19 15:17:30 drac Exp $
 
 EAPI=1
 
+inherit autotools eutils
+
 DESCRIPTION="an easily extensible archive format"
 HOMEPAGE="http://code.google.com/p/xar"
 SRC_URI="http://xar.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+bzip2"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="acl +bzip2"
 
-# bad. automagic acl and bzip2 linkage.
-RDEPEND="dev-libs/openssl
+DEPEND="dev-libs/openssl
 	dev-libs/libxml2
+	sys-libs/zlib
+	acl? ( sys-apps/acl )
 	bzip2? ( app-arch/bzip2 )"
-DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-automagic_acl_and_bzip2.patch
+	eautoconf
+}
+
+src_compile() {
+	econf $(use_enable acl) $(use_enable bzip2)
+	emake || die "emake failed."
+}
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed."