Version bumped. Added pkg_setup, bug #147764.

(Portage version: 2.1.1-r1)

5 files changed, 82 insertions, 3 deletions

diff --git a/app-backup/dar/ChangeLog b/app-backup/dar/ChangeLog
index 766685197677..78bdf9d691c3 100644
--- a/app-backup/dar/ChangeLog
+++ b/app-backup/dar/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-backup/dar
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/dar/ChangeLog,v 1.17 2006/09/15 17:30:02 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/dar/ChangeLog,v 1.18 2006/11/03 04:15:11 matsuu Exp $
+
+*dar-2.3.2 (03 Nov 2006)
+
+  03 Nov 2006; MATSUU Takuto <matsuu@gentoo.org> dar-2.2.6.ebuild,
+  dar-2.3.1.ebuild, +dar-2.3.2.ebuild:
+  Version bumped.
+  Added pkg_setup, bug #147764.
 
   15 Sep 2006; MATSUU Takuto <matsuu@gentoo.org> dar-2.3.1.ebuild:
   Removed examples USE flag, #143116.
diff --git a/app-backup/dar/dar-2.2.6.ebuild b/app-backup/dar/dar-2.2.6.ebuild
index 9668331905ec..dde0b04ab798 100644
--- a/app-backup/dar/dar-2.2.6.ebuild
+++ b/app-backup/dar/dar-2.2.6.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/app-backup/dar/dar-2.2.6.ebuild,v 1.4 2006/04/26 18:03:19 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/dar/dar-2.2.6.ebuild,v 1.5 2006/11/03 04:15:11 matsuu Exp $
 
 inherit flag-o-matic
 
@@ -20,6 +20,14 @@ DEPEND=">=sys-libs/zlib-1.2.3
 	nls? ( sys-devel/gettext )
 	ssl? ( dev-libs/openssl )"
 
+pkg_setup() {
+	if use dar32 && use dar64 ; then
+		eerror "dar32 and dar64 cannot be enabled together."
+		eerror "Please remove one of them and try the emerge again."
+		die "Please remove dar32 or dar64."
+	fi
+}
+
 src_compile() {
 	local myconf="--disable-upx"
 
diff --git a/app-backup/dar/dar-2.3.1.ebuild b/app-backup/dar/dar-2.3.1.ebuild
index 2126f371f3e6..a0c5bf0cfc3a 100644
--- a/app-backup/dar/dar-2.3.1.ebuild
+++ b/app-backup/dar/dar-2.3.1.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/app-backup/dar/dar-2.3.1.ebuild,v 1.2 2006/09/15 17:30:02 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/dar/dar-2.3.1.ebuild,v 1.3 2006/11/03 04:15:11 matsuu Exp $
 
 inherit flag-o-matic
 
@@ -21,6 +21,14 @@ DEPEND=">=sys-libs/zlib-1.2.3
 	nls? ( sys-devel/gettext )
 	ssl? ( dev-libs/openssl )"
 
+pkg_setup() {
+	if use dar32 && use dar64 ; then
+		eerror "dar32 and dar64 cannot be enabled together."
+		eerror "Please remove one of them and try the emerge again."
+		die "Please remove dar32 or dar64."
+	fi
+}
+
 src_compile() {
 	local myconf="--disable-upx"
 
diff --git a/app-backup/dar/dar-2.3.2.ebuild b/app-backup/dar/dar-2.3.2.ebuild
new file mode 100644
index 000000000000..bb9d17b6710e
--- /dev/null
+++ b/app-backup/dar/dar-2.3.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/dar/dar-2.3.2.ebuild,v 1.1 2006/11/03 04:15:11 matsuu Exp $
+
+inherit flag-o-matic
+
+DESCRIPTION="A full featured backup tool, aimed for disks (floppy,CDR(W),DVDR(W),zip,jazz etc.)"
+HOMEPAGE="http://dar.linux.free.fr/"
+SRC_URI="mirror://sourceforge/dar/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="acl dar32 dar64 doc nls ssl"
+
+DEPEND=">=sys-libs/zlib-1.2.3
+	>=app-arch/bzip2-1.0.2
+	acl? ( sys-apps/attr )
+	doc? ( app-doc/doxygen )
+	nls? ( sys-devel/gettext )
+	ssl? ( dev-libs/openssl )"
+
+pkg_setup() {
+	if use dar32 && use dar64 ; then
+		eerror "dar32 and dar64 cannot be enabled together."
+		eerror "Please remove one of them and try the emerge again."
+		die "Please remove dar32 or dar64."
+	fi
+}
+
+src_compile() {
+	local myconf="--disable-upx"
+
+	# Bug 103741
+	filter-flags -fomit-frame-pointer
+
+	use acl || myconf="${myconf} --disable-ea-support"
+	use dar32 && myconf="${myconf} --enable-mode=32"
+	use dar64 && myconf="${myconf} --enable-mode=64"
+	use doc || myconf="${myconf} --disable-build-html"
+	# use examples && myconf="${myconf} --enable-examples"
+	use nls || myconf="${myconf} --disable-nls"
+	use ssl || myconf="${myconf} --disable-libcrypto-linking"
+
+	econf ${myconf} || die
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" pkgdatadir=/usr/share/doc/${PF}/html install || die
+
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+}
diff --git a/app-backup/dar/files/digest-dar-2.3.2 b/app-backup/dar/files/digest-dar-2.3.2
new file mode 100644
index 000000000000..576ac852d505
--- /dev/null
+++ b/app-backup/dar/files/digest-dar-2.3.2
@@ -0,0 +1,3 @@
+MD5 6743849db51958e751519c31d6494ce7 dar-2.3.2.tar.gz 1164461
+RMD160 be4d92bb272fa32a229664f0e3b66ed5cbbc565d dar-2.3.2.tar.gz 1164461
+SHA256 29d63be662c09f4413e1bfde2be6a42a04b8c6108f965ebd4c5b49dedd5b8431 dar-2.3.2.tar.gz 1164461