Version bump.

Package-Manager: portage-2.0.54-r2

11 files changed, 28 insertions, 250 deletions

diff --git a/app-office/kmymoney2/ChangeLog b/app-office/kmymoney2/ChangeLog
index 8876e99df024..d2a8ebf6c992 100644
--- a/app-office/kmymoney2/ChangeLog
+++ b/app-office/kmymoney2/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-office/kmymoney2
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney2/ChangeLog,v 1.48 2006/05/06 23:39:31 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney2/ChangeLog,v 1.49 2006/05/28 21:14:22 carlo Exp $
+
+*kmymoney2-0.8.4 (28 May 2006)
+
+  28 May 2006; Carsten Lohrke <carlo@gentoo.org>
+  -files/kmymoney2-0.6.4-configure-arts.patch, -kmymoney2-0.6.4.ebuild,
+  -kmymoney2-0.8.ebuild, -kmymoney2-0.8.1.ebuild, -kmymoney2-0.8.2.ebuild,
+  +kmymoney2-0.8.4.ebuild:
+  Version bump.
 
   06 May 2006; Jason Wever <weeve@gentoo.org> kmymoney2-0.8.3.ebuild:
   Stable on SPARC wrt bug #130960.
diff --git a/app-office/kmymoney2/files/digest-kmymoney2-0.6.4 b/app-office/kmymoney2/files/digest-kmymoney2-0.6.4
deleted file mode 100644
index 903e7e0bdfc0..000000000000
--- a/app-office/kmymoney2/files/digest-kmymoney2-0.6.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 01257a16ef26487f8891106b33ad2c64 kmymoney2-0.6.4.tar.bz2 1582764
diff --git a/app-office/kmymoney2/files/digest-kmymoney2-0.8 b/app-office/kmymoney2/files/digest-kmymoney2-0.8
deleted file mode 100644
index c6f0bb2ed90a..000000000000
--- a/app-office/kmymoney2/files/digest-kmymoney2-0.8
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a944bcfb7556d20e79d6e8cfc1e30333 kmymoney2-0.8.tar.bz2 6078609
-RMD160 53337e1f48ea3cad74328640302348257005e148 kmymoney2-0.8.tar.bz2 6078609
-SHA256 e765799dfdb40462020638bf1a0b3849f591de875f77e6c72b864b6e2f4c0eee kmymoney2-0.8.tar.bz2 6078609
diff --git a/app-office/kmymoney2/files/digest-kmymoney2-0.8.1 b/app-office/kmymoney2/files/digest-kmymoney2-0.8.1
deleted file mode 100644
index c59d833f624b..000000000000
--- a/app-office/kmymoney2/files/digest-kmymoney2-0.8.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 266fd411098cdce53d7db202960f07d5 kmymoney2-0.8.1.tar.bz2 6053272
-RMD160 cf199c60809938f53ce2ce734e022400c46e0037 kmymoney2-0.8.1.tar.bz2 6053272
-SHA256 4419e061bf234e478d15412d266e2dc40785f6e5b352c7c3c3144cb3910a63d3 kmymoney2-0.8.1.tar.bz2 6053272
diff --git a/app-office/kmymoney2/files/digest-kmymoney2-0.8.2 b/app-office/kmymoney2/files/digest-kmymoney2-0.8.2
deleted file mode 100644
index 90801d5ab5d8..000000000000
--- a/app-office/kmymoney2/files/digest-kmymoney2-0.8.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ffb09eaba4f93cd47e9600a2cb6b02c5 kmymoney2-0.8.2.tar.bz2 6061389
-RMD160 8bb90b1238b05b99f021136abd4f8e01b514d8b2 kmymoney2-0.8.2.tar.bz2 6061389
-SHA256 e9bb08f768d89b6839864920ba087a1fa37eb9ed7adfc9adb088b7267b29e530 kmymoney2-0.8.2.tar.bz2 6061389
diff --git a/app-office/kmymoney2/files/digest-kmymoney2-0.8.4 b/app-office/kmymoney2/files/digest-kmymoney2-0.8.4
new file mode 100644
index 000000000000..fa7320134702
--- /dev/null
+++ b/app-office/kmymoney2/files/digest-kmymoney2-0.8.4
@@ -0,0 +1 @@
+MD5 edac4fad63c3a9f90c054e105e48aa7a kmymoney2-0.8.4.tar.bz2 5876395
diff --git a/app-office/kmymoney2/files/kmymoney2-0.6.4-configure-arts.patch b/app-office/kmymoney2/files/kmymoney2-0.6.4-configure-arts.patch
deleted file mode 100644
index 85d2d10be62b..000000000000
--- a/app-office/kmymoney2/files/kmymoney2-0.6.4-configure-arts.patch
+++ /dev/null
@@ -1,142 +0,0 @@
---- configure.orig	2005-02-05 16:01:37.622988944 +0000
-+++ configure	2005-02-05 16:01:45.342815352 +0000
-@@ -14245,139 +14245,6 @@
- 
-    fi
- 
--
--   echo "$as_me:$LINENO: checking for mcopidl" >&5
--echo $ECHO_N "checking for mcopidl... $ECHO_C" >&6
--   if test -n "$MCOPIDL"; then
--        kde_cv_path="$MCOPIDL";
--   else
--        kde_cache=`echo mcopidl | sed 'y%./+-%__p_%'`
--
--        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--
--        kde_cv_path="NONE"
--	dirs="$kde_default_bindirs"
--	kde_save_IFS=$IFS
--	IFS=':'
--	for dir in $PATH; do
--	  dirs="$dirs $dir"
--        done
--	IFS=$kde_save_IFS
--
--        for dir in $dirs; do
--	  if test -x "$dir/mcopidl"; then
--	    if test -n ""
--	    then
--              evalstr="$dir/mcopidl  2>&1 "
--	      if eval $evalstr; then
--                kde_cv_path="$dir/mcopidl"
--                break
--	      fi
--            else
--		kde_cv_path="$dir/mcopidl"
--                break
--	    fi
--          fi
--        done
--
--        eval "kde_cv_path_$kde_cache=$kde_cv_path"
--
--
--fi
--
--
--      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
--
--   fi
--
--   if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
--
--    { { echo "$as_me:$LINENO: error: The important program mcopidl was not found!
--Please check whether you installed KDE correctly.
--" >&5
--echo "$as_me: error: The important program mcopidl was not found!
--Please check whether you installed KDE correctly.
--" >&2;}
--   { (exit 1); exit 1; }; }
--
--   else
--      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
--echo "${ECHO_T}$kde_cv_path" >&6
--      MCOPIDL=$kde_cv_path
--
--   fi
--
--
--   echo "$as_me:$LINENO: checking for artsc-config" >&5
--echo $ECHO_N "checking for artsc-config... $ECHO_C" >&6
--   if test -n "$ARTSCCONFIG"; then
--        kde_cv_path="$ARTSCCONFIG";
--   else
--        kde_cache=`echo artsc-config | sed 'y%./+-%__p_%'`
--
--        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--
--        kde_cv_path="NONE"
--	dirs="$kde_default_bindirs"
--	kde_save_IFS=$IFS
--	IFS=':'
--	for dir in $PATH; do
--	  dirs="$dirs $dir"
--        done
--	IFS=$kde_save_IFS
--
--        for dir in $dirs; do
--	  if test -x "$dir/artsc-config"; then
--	    if test -n ""
--	    then
--              evalstr="$dir/artsc-config  2>&1 "
--	      if eval $evalstr; then
--                kde_cv_path="$dir/artsc-config"
--                break
--	      fi
--            else
--		kde_cv_path="$dir/artsc-config"
--                break
--	    fi
--          fi
--        done
--
--        eval "kde_cv_path_$kde_cache=$kde_cv_path"
--
--
--fi
--
--
--      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
--
--   fi
--
--   if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
--
--    { { echo "$as_me:$LINENO: error: The important program artsc-config was not found!
--Please check whether you installed KDE correctly.
--" >&5
--echo "$as_me: error: The important program artsc-config was not found!
--Please check whether you installed KDE correctly.
--" >&2;}
--   { (exit 1); exit 1; }; }
--
--   else
--      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
--echo "${ECHO_T}$kde_cv_path" >&6
--      ARTSCCONFIG=$kde_cv_path
--
--   fi
--
--
-    echo "$as_me:$LINENO: checking for kde-config" >&5
- echo $ECHO_N "checking for kde-config... $ECHO_C" >&6
-    if test -n "$KDECONFIG"; then
diff --git a/app-office/kmymoney2/kmymoney2-0.6.4.ebuild b/app-office/kmymoney2/kmymoney2-0.6.4.ebuild
deleted file mode 100644
index f87e4c282959..000000000000
--- a/app-office/kmymoney2/kmymoney2-0.6.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney2/kmymoney2-0.6.4.ebuild,v 1.7 2005/07/13 19:56:05 josejx Exp $
-
-inherit kde
-
-DESCRIPTION="Personal Finances Manager for KDE"
-HOMEPAGE="http://kmymoney2.sourceforge.net"
-SRC_URI="mirror://sourceforge/kmymoney2/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc sparc x86"
-
-IUSE="arts"
-SLOT="0"
-
-DEPEND="dev-libs/libxml2
-	dev-cpp/libxmlpp"
-need-kde 3
-
-src_unpack() {
-	kde_src_unpack
-
-	use arts || epatch ${FILESDIR}/${P}-configure-arts.patch
-}
diff --git a/app-office/kmymoney2/kmymoney2-0.8.2.ebuild b/app-office/kmymoney2/kmymoney2-0.8.2.ebuild
deleted file mode 100644
index 411143e4153f..000000000000
--- a/app-office/kmymoney2/kmymoney2-0.8.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney2/kmymoney2-0.8.2.ebuild,v 1.1 2005/12/31 16:28:48 carlo Exp $
-
-inherit kde
-
-DESCRIPTION="Personal Finances Manager for KDE."
-HOMEPAGE="http://kmymoney2.sourceforge.net"
-SRC_URI="mirror://sourceforge/kmymoney2/${P}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="crypt ofx"
-
-DEPEND="dev-libs/libxml2
-	ofx? ( >=dev-libs/libofx-0.7 )"
-
-RDEPEND="${DEPEND}
-	crypt? ( app-crypt/gnupg )"
-
-need-kde 3.2
-
-# TODO: support maketest
-# (needs cppunit in DEPEND)
-
-src_compile() {
-	local myconf="$(use_enable ofx ofxplugin)
-	              --disable-kbanking
-	              --disable-cppunit"
-
-	kde_src_compile
-}
diff --git a/app-office/kmymoney2/kmymoney2-0.8.1.ebuild b/app-office/kmymoney2/kmymoney2-0.8.4.ebuild
index ec0a23676f81..1ee5de5bd8f7 100644
--- a/app-office/kmymoney2/kmymoney2-0.8.1.ebuild
+++ b/app-office/kmymoney2/kmymoney2-0.8.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney2/kmymoney2-0.8.1.ebuild,v 1.1 2005/11/16 15:27:53 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney2/kmymoney2-0.8.4.ebuild,v 1.1 2006/05/28 21:14:22 carlo Exp $
 
 inherit kde
 
@@ -11,23 +11,35 @@ LICENSE="GPL-2"
 
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="crypt ofx"
+IUSE="crypt ofx hbci"
 
 DEPEND="dev-libs/libxml2
+	hbci? ( >=net-libs/aqbanking-1.8.0_beta )
 	ofx? ( >=dev-libs/libofx-0.7 )"
 
 RDEPEND="${DEPEND}
 	crypt? ( app-crypt/gnupg )"
 
-need-kde 3.2
+DEPEND="${DEPEND}
+	dev-util/cppunit"
+
+need-kde 3.4
 
 # TODO: support maketest
 # (needs cppunit in DEPEND)
 
+pkg_setup() {
+	if use hbci && ! built_with_use net-libs/aqbanking kde; then
+		eerror "The HBCI plugin is shipped by net-libs/aqbanking,"
+		eerror "which has to be built with KDE support."
+		die "rebuild net-libs/aqbanking with USE=kde"
+	fi
+}
+
 src_compile() {
 	local myconf="$(use_enable ofx ofxplugin)
-	              --disable-kbanking
-	              --disable-cppunit"
+			$(use_enable hbci kbanking)
+			--disable-cppunit"
 
 	kde_src_compile
 }
diff --git a/app-office/kmymoney2/kmymoney2-0.8.ebuild b/app-office/kmymoney2/kmymoney2-0.8.ebuild
deleted file mode 100644
index f21347820ed4..000000000000
--- a/app-office/kmymoney2/kmymoney2-0.8.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney2/kmymoney2-0.8.ebuild,v 1.6 2005/11/11 23:07:08 hansmi Exp $
-
-inherit kde
-
-DESCRIPTION="Personal Finances Manager for KDE."
-HOMEPAGE="http://kmymoney2.sourceforge.net"
-SRC_URI="mirror://sourceforge/kmymoney2/${P}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE="crypt ofx"
-
-DEPEND="dev-libs/libxml2
-	ofx? ( >=dev-libs/libofx-0.7 )"
-
-RDEPEND="${DEPEND}
-	crypt? ( app-crypt/gnupg )"
-
-need-kde 3.2
-
-# TODO: support maketest
-# (needs cppunit in DEPEND)
-
-src_compile() {
-	local myconf="$(use_enable ofx ofxplugin)
-	              --disable-kbanking
-	              --disable-cppunit"
-
-	kde_src_compile
-}