Version bump.

(Portage version: 2.0.51.19)

9 files changed, 23 insertions, 71 deletions

diff --git a/net-nntp/klibido/ChangeLog b/net-nntp/klibido/ChangeLog
index 1b4c8d56e079..d42fbe15983e 100644
--- a/net-nntp/klibido/ChangeLog
+++ b/net-nntp/klibido/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-nntp/klibido
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/klibido/ChangeLog,v 1.4 2005/03/11 14:29:12 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/klibido/ChangeLog,v 1.5 2005/03/13 12:05:06 swegener Exp $
+
+*klibido-0.2.1.1 (13 Mar 2005)
+
+  13 Mar 2005; Sven Wegener <swegener@gentoo.org>
+  -files/0.2.0-nntpthreadsocket.cpp.diff, -files/0.2.0-qmgr.cpp.diff,
+  -klibido-0.2.0.ebuild, -klibido-0.2.0-r1.ebuild, +klibido-0.2.1.1.ebuild:
+  Version bump.
 
   11 Mar 2005; David Holm <dholm@gentoo.org> klibido-0.2.0-r1.ebuild:
   Added to ~ppc.
diff --git a/net-nntp/klibido/Manifest b/net-nntp/klibido/Manifest
index f5d87a0f26bb..f117fa8178dd 100644
--- a/net-nntp/klibido/Manifest
+++ b/net-nntp/klibido/Manifest
@@ -1,8 +1,10 @@
-MD5 b70888caf3063830a3986c5f527cfd53 ChangeLog 891
+MD5 40f7f06091359d04a1a0ca7b57af1cea klibido-0.2.1.1.ebuild 738
 MD5 9380c2a3c6d9b12af5d90913727ce07b klibido-0.2.0.ebuild 600
-MD5 d4764f5c17f5e0b416f7ddf271c77d71 metadata.xml 161
 MD5 40f7f06091359d04a1a0ca7b57af1cea klibido-0.2.0-r1.ebuild 738
-MD5 266652e9c7738532ff1efc6c4dd81b83 files/digest-klibido-0.2.0 65
+MD5 b70888caf3063830a3986c5f527cfd53 ChangeLog 891
+MD5 d4764f5c17f5e0b416f7ddf271c77d71 metadata.xml 161
 MD5 a1279b9654cf71671843eb84edb39b7c files/0.2.0-nntpthreadsocket.cpp.diff 504
-MD5 1c3a78d0eb80e4a38c6d687d973e65a4 files/0.2.0-qmgr.cpp.diff 430
 MD5 266652e9c7738532ff1efc6c4dd81b83 files/digest-klibido-0.2.0-r1 65
+MD5 1c3a78d0eb80e4a38c6d687d973e65a4 files/0.2.0-qmgr.cpp.diff 430
+MD5 266652e9c7738532ff1efc6c4dd81b83 files/digest-klibido-0.2.0 65
+MD5 6ac27d7417368cc0fcb31b5f4d98b3d4 files/digest-klibido-0.2.1.1 67
diff --git a/net-nntp/klibido/files/0.2.0-nntpthreadsocket.cpp.diff b/net-nntp/klibido/files/0.2.0-nntpthreadsocket.cpp.diff
deleted file mode 100644
index d824c25e5abe..000000000000
--- a/net-nntp/klibido/files/0.2.0-nntpthreadsocket.cpp.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/nntpthreadsocket.cpp	2004-11-17 00:04:18.000000000 +0100
-+++ src/nntpthreadsocket.cpp.fixed	2005-01-04 14:59:07.460083575 +0100
-@@ -1983,14 +1983,14 @@
- 	if (!m_sendCmd(cmd, NntpThreadSocket::list))
- 		return false;	
- 	
--	while (!(cancel) && line[0] != '.') {
-+	while (!(line[0] == '.') && !(line[1] == '\0')  ) {
- 		if (!waitLine())
- 			return false;
- 		
- 		
- 		
- 		while (m_readLine()) {
--			if (line[0] == '.')
-+			if ( (line[0] == '.') && (line[1] == '\0') )
- 				break;
- 			else {
- 								
diff --git a/net-nntp/klibido/files/0.2.0-qmgr.cpp.diff b/net-nntp/klibido/files/0.2.0-qmgr.cpp.diff
deleted file mode 100644
index c0736f4a2e1b..000000000000
--- a/net-nntp/klibido/files/0.2.0-qmgr.cpp.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/qmgr.cpp	2004-11-17 00:04:19.000000000 +0100
-+++ src/qmgr.cpp.fixed	2004-12-28 01:36:08.634618228 +0100
-@@ -2177,7 +2177,7 @@
- 		memset(&key, 0, sizeof(key));
- 		key.set_flags(DB_DBT_MALLOC);
- 		memset(&data, 0, sizeof(data));
--		key.set_flags(DB_DBT_MALLOC);
-+		data.set_flags(DB_DBT_MALLOC);
- // 		qDebug("Id: %d", id);
- // 		qDebug("Newsgroup: %s", qsi->group.latin1());
- // 		qDebug("index: %s", qsi->index.latin1());
diff --git a/net-nntp/klibido/files/digest-klibido-0.2.0 b/net-nntp/klibido/files/digest-klibido-0.2.0
deleted file mode 100644
index 9015f3480eea..000000000000
--- a/net-nntp/klibido/files/digest-klibido-0.2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d4851385b333ddf8970ac24955ea4c48 klibido-0.2.0.tar.gz 756394
diff --git a/net-nntp/klibido/files/digest-klibido-0.2.0-r1 b/net-nntp/klibido/files/digest-klibido-0.2.0-r1
deleted file mode 100644
index 9015f3480eea..000000000000
--- a/net-nntp/klibido/files/digest-klibido-0.2.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d4851385b333ddf8970ac24955ea4c48 klibido-0.2.0.tar.gz 756394
diff --git a/net-nntp/klibido/files/digest-klibido-0.2.1.1 b/net-nntp/klibido/files/digest-klibido-0.2.1.1
new file mode 100644
index 000000000000..1e4f287ee2f8
--- /dev/null
+++ b/net-nntp/klibido/files/digest-klibido-0.2.1.1
@@ -0,0 +1 @@
+MD5 eb584762485f9b064f68068af7516b76 klibido-0.2.1.1.tar.gz 681765
diff --git a/net-nntp/klibido/klibido-0.2.0.ebuild b/net-nntp/klibido/klibido-0.2.0.ebuild
deleted file mode 100644
index 9c1a5ef43511..000000000000
--- a/net-nntp/klibido/klibido-0.2.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/klibido/klibido-0.2.0.ebuild,v 1.1 2005/01/17 19:47:22 swegener Exp $
-
-inherit kde
-
-DESCRIPTION="KDE Linux Binaries Downloader"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://klibido.sourceforge.net/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND="dev-libs/uulib
-	=sys-libs/db-4.1*"
-
-need-kde 3
-
-src_compile() {
-	myconf="${myconf} --datadir=${D}/usr/share --with-extra-includes=/usr/include/db4.1/"
-	kde_src_compile
-}
diff --git a/net-nntp/klibido/klibido-0.2.0-r1.ebuild b/net-nntp/klibido/klibido-0.2.1.1.ebuild
index 4cb8797bd233..d0380381bcf1 100644
--- a/net-nntp/klibido/klibido-0.2.0-r1.ebuild
+++ b/net-nntp/klibido/klibido-0.2.1.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/klibido/klibido-0.2.0-r1.ebuild,v 1.2 2005/03/11 14:29:12 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/klibido/klibido-0.2.1.1.ebuild,v 1.1 2005/03/13 12:05:06 swegener Exp $
 
-inherit kde eutils
+inherit kde eutils versionator
 
 DESCRIPTION="KDE Linux Binaries Downloader"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -14,17 +14,15 @@ KEYWORDS="~x86 ~ppc"
 IUSE=""
 
 DEPEND="dev-libs/uulib
-	=sys-libs/db-4.1*"
+	>=sys-libs/db-4.1"
 
 need-kde 3
 
-src_unpack() {
-	kde_src_unpack
-	epatch ${FILESDIR}/0.2.0-nntpthreadsocket.cpp.diff
-	epatch ${FILESDIR}/0.2.0-qmgr.cpp.diff
-}
-
 src_compile() {
-	myconf="${myconf} --datadir=${D}/usr/share --with-extra-includes=/usr/include/db4.1/"
+	local libdbver="$(best_version sys-libs/db)"
+	libdbver="${libdbver/sys-libs\/db-/}"
+	libdbver="$(get_version_component_range 1-2 ${libdbver})"
+
+	myconf="${myconf} --datadir=${D}/usr/share --with-extra-includes=/usr/include/db${libdbver}/"
 	kde_src_compile
 }