Fixed dependency, bug #221639.

(Portage version: 2.1.5_rc6)

5 files changed, 16 insertions, 191 deletions

diff --git a/app-backup/dar/ChangeLog b/app-backup/dar/ChangeLog
index 911e0f3c355e..e258c47f55e5 100644
--- a/app-backup/dar/ChangeLog
+++ b/app-backup/dar/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-backup/dar
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/dar/ChangeLog,v 1.28 2008/03/07 17:00:15 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/dar/ChangeLog,v 1.29 2008/05/17 01:48:46 matsuu Exp $
+
+*dar-2.3.7-r1 (17 May 2008)
+
+  17 May 2008; MATSUU Takuto <matsuu@gentoo.org> -dar-2.2.6.ebuild,
+  -dar-2.3.4.ebuild, -dar-2.3.5.ebuild, -dar-2.3.6.ebuild,
+  +dar-2.3.7-r1.ebuild:
+  Fixed dependency, bug #221639.
 
 *dar-2.3.7 (07 Mar 2008)
 
diff --git a/app-backup/dar/dar-2.2.6.ebuild b/app-backup/dar/dar-2.2.6.ebuild
deleted file mode 100644
index dde0b04ab798..000000000000
--- a/app-backup/dar/dar-2.2.6.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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.5 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="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE="acl dar32 dar64 doc examples nls ssl static"
-
-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"
-	use static || myconf="${myconf} --enable-static=no --disable-dar-static"
-
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-
-	rm "${D}"/usr/share/dar/{[A-Z]*,*.html}
-
-	dodoc AUTHORS BUGS ChangeLog NEWS README THANKS TODO
-	dodoc doc/{COMMAND_LINE,FAQ,FEATURES,GOOD_BACKUP_PRACTICE,LIMITATIONS}
-	dodoc doc/{LINKS,NOTES,TUTORIAL}
-	dohtml doc/api_tutorial.html doc/mini-howto/*.html
-
-	if use doc ; then
-		dohtml doc/html/*
-	fi
-}
diff --git a/app-backup/dar/dar-2.3.5.ebuild b/app-backup/dar/dar-2.3.5.ebuild
deleted file mode 100644
index 2e8891f21c78..000000000000
--- a/app-backup/dar/dar-2.3.5.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/dar/dar-2.3.5.ebuild,v 1.1 2007/09/12 23:30:57 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="0"
-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_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -e '/^dist_noinst_DATA/s/$/ macro_tools.hpp/' \
-		-e '/^noinst_HEADERS/s/macro_tools.hpp//' \
-		src/libdar/Makefile* || die
-}
-
-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/dar-2.3.6.ebuild b/app-backup/dar/dar-2.3.6.ebuild
deleted file mode 100644
index a272816c9c7d..000000000000
--- a/app-backup/dar/dar-2.3.6.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/dar/dar-2.3.6.ebuild,v 1.1 2007/10/15 16:25:42 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="0"
-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_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -e '/^dist_noinst_DATA/s/$/ macro_tools.hpp/' \
-		-e '/^noinst_HEADERS/s/macro_tools.hpp//' \
-		src/libdar/Makefile* || die
-}
-
-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/dar-2.3.4.ebuild b/app-backup/dar/dar-2.3.7-r1.ebuild
index 53e67be7843b..94ce11d368e0 100644
--- a/app-backup/dar/dar-2.3.4.ebuild
+++ b/app-backup/dar/dar-2.3.7-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/dar/dar-2.3.4.ebuild,v 1.1 2007/07/12 16:42:09 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/dar/dar-2.3.7-r1.ebuild,v 1.1 2008/05/17 01:48:46 matsuu Exp $
 
 inherit flag-o-matic
 
@@ -13,12 +13,15 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="acl dar32 dar64 doc nls ssl"
 
-DEPEND=">=sys-libs/zlib-1.2.3
+
+RDEPEND=">=sys-libs/zlib-1.2.3
 	>=app-arch/bzip2-1.0.2
 	acl? ( sys-apps/attr )
-	doc? ( app-doc/doxygen )
-	nls? ( sys-devel/gettext )
+	nls? ( virtual/libintl )
 	ssl? ( dev-libs/openssl )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	doc? ( app-doc/doxygen )"
 
 pkg_setup() {
 	if use dar32 && use dar64 ; then