version cleanup, new version available

10 files changed, 27 insertions, 62 deletions

diff --git a/net-im/kmerlin/ChangeLog b/net-im/kmerlin/ChangeLog
index f56770d3e05a..b154e5c071ac 100644
--- a/net-im/kmerlin/ChangeLog
+++ b/net-im/kmerlin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/kmerlin
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kmerlin/ChangeLog,v 1.14 2004/03/14 17:25:38 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kmerlin/ChangeLog,v 1.15 2004/04/16 13:47:08 caleb Exp $
+
+  16 Apr 2004; root <root@gentoo.org> kmerlin-1.0-r1.ebuild,
+  kmerlin-1.2.ebuild, kmerlin-1.3_beta2.ebuild:
+  version cleanup
 
   14 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> kmerlin-1.0-r1.ebuild,
   kmerlin-1.2.ebuild, kmerlin-1.3_beta2.ebuild, kmerlin-1.3_beta3.ebuild:
diff --git a/net-im/kmerlin/Manifest b/net-im/kmerlin/Manifest
index 97b7113bf1c8..88ad0e57700f 100644
--- a/net-im/kmerlin/Manifest
+++ b/net-im/kmerlin/Manifest
@@ -1,10 +1,13 @@
-MD5 8d0279e573b00f101553eb8751ab61f8 ChangeLog 2439
 MD5 d41fa7cdb8bb19b37f6b01667e4d8409 kmerlin-1.0-r1.ebuild 508
+MD5 b42a07990cd0e8f7a1501bc25382b141 kmerlin-1.3_beta3.ebuild 547
+MD5 b2e79cbe945268c69387445512a41c5d kmerlin-1.4.2.ebuild 508
 MD5 4cf1ce1419df2ef2dfb8a92dbde24a3b kmerlin-1.2.ebuild 897
 MD5 3f2501fbbcb4cfeddc3cf26864eb3603 kmerlin-1.3_beta2.ebuild 454
-MD5 b42a07990cd0e8f7a1501bc25382b141 kmerlin-1.3_beta3.ebuild 547
+MD5 8d0279e573b00f101553eb8751ab61f8 ChangeLog 2439
 MD5 1f4584aadb7c6e4348ad90e84431434f files/digest-kmerlin-1.0-r1 63
-MD5 fcf5ac1410ab3c598ba3584f55738761 files/digest-kmerlin-1.2 63
 MD5 418a2cd579981826a49d9231b86902c7 files/digest-kmerlin-1.3_beta2 68
 MD5 156ee3f9ef6cf8947eb4a1eb825002b1 files/digest-kmerlin-1.3_beta3 70
+MD5 fcf5ac1410ab3c598ba3584f55738761 files/digest-kmerlin-1.2 63
+MD5 9994a37fbf4a17bd95aa6fc4c90c5b7b files/digest-kmerlin-1.4.2 66
 MD5 34daa95b89ca1042203f67cea36dd470 files/kmerlin-1.3_beta3-docbook.diff 491
+MD5 34daa95b89ca1042203f67cea36dd470 files/kmerlin-1.4.2-docbook.diff 491
diff --git a/net-im/kmerlin/files/digest-kmerlin-1.0-r1 b/net-im/kmerlin/files/digest-kmerlin-1.0-r1
deleted file mode 100644
index f839b5675cef..000000000000
--- a/net-im/kmerlin/files/digest-kmerlin-1.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5674c1caaa369db5be7211d1b54293a5 kmerlin-1.0.tar.gz 667195
diff --git a/net-im/kmerlin/files/digest-kmerlin-1.2 b/net-im/kmerlin/files/digest-kmerlin-1.2
deleted file mode 100644
index 36d34575b2d5..000000000000
--- a/net-im/kmerlin/files/digest-kmerlin-1.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 411bae0b9fd1f69976e8e57e9ff2e78d kmerlin-1.2.tar.gz 917716
diff --git a/net-im/kmerlin/files/digest-kmerlin-1.3_beta2 b/net-im/kmerlin/files/digest-kmerlin-1.3_beta2
deleted file mode 100644
index e895731cf229..000000000000
--- a/net-im/kmerlin/files/digest-kmerlin-1.3_beta2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 95f81b432fbbcfc2a1b5a209c6f71a52 kmerlin-1.3Beta2.tar.gz 925902
diff --git a/net-im/kmerlin/files/digest-kmerlin-1.4.2 b/net-im/kmerlin/files/digest-kmerlin-1.4.2
new file mode 100644
index 000000000000..ac460c161caf
--- /dev/null
+++ b/net-im/kmerlin/files/digest-kmerlin-1.4.2
@@ -0,0 +1 @@
+MD5 8cdfea643a9cecde86ac17041de38c2e kmerlin-1.4.2.tar.gz 1023785
diff --git a/net-im/kmerlin/files/kmerlin-1.4.2-docbook.diff b/net-im/kmerlin/files/kmerlin-1.4.2-docbook.diff
new file mode 100644
index 000000000000..beb00521694e
--- /dev/null
+++ b/net-im/kmerlin/files/kmerlin-1.4.2-docbook.diff
@@ -0,0 +1,9 @@
+--- doc/en/index.docbook	2003-01-10 23:21:58.000000000 +0200
++++ doc/en/index.docbook	2003-03-03 19:49:25.000000000 +0200
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" ?>
+-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
++<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.0//EN" "dtd/kdex.dtd" [
+   <!ENTITY kappname "&KMerlin;">
+   <!ENTITY % addindex "IGNORE">
+   <!ENTITY % English "INCLUDE" > <!-- change language only here -->   
diff --git a/net-im/kmerlin/kmerlin-1.2.ebuild b/net-im/kmerlin/kmerlin-1.2.ebuild
deleted file mode 100644
index 960766040c53..000000000000
--- a/net-im/kmerlin/kmerlin-1.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kmerlin/kmerlin-1.2.ebuild,v 1.7 2004/03/14 17:25:38 mr_bones_ Exp $
-
-inherit kde
-
-need-kde 3
-
-need-autoconf 2.1
-
-DESCRIPTION="KDE MSN Messenger"
-SRC_URI="mirror://sourceforge/kmerlin/${P}.tar.gz"
-HOMEPAGE="http://kmerlin.olsd.de"
-
-LICENSE="GPL-2"
-KEYWORDS="x86"
-
-src_unpack() {
-
-	kde_src_unpack
-
-	# the pregenerated configure script is buggy
-	cd ${S}
-	rm configure configure.in
-
-	# they also have pregenerated .cpp/.h files which should be generated by uic
-	# otherwise they will only work with one specific qt-version
-#	cd ${S}/kmerlin
-#	rm adduser.cpp adduser.h chatview.cpp chatview.h accountdlg.cpp \
-#	   accountdlg.h base.cpp base.h blocked.cpp blocked.h infowidget.cpp \
-#	   infowidget.h alert.cpp alert.h newuser.cpp newuser.h
-}
diff --git a/net-im/kmerlin/kmerlin-1.3_beta2.ebuild b/net-im/kmerlin/kmerlin-1.3_beta2.ebuild
deleted file mode 100644
index 0ff6b490b380..000000000000
--- a/net-im/kmerlin/kmerlin-1.3_beta2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kmerlin/kmerlin-1.3_beta2.ebuild,v 1.4 2004/03/14 17:25:38 mr_bones_ Exp $
-
-inherit kde
-
-need-kde 3
-
-IUSE=""
-MY_P=${P/_b/B}
-DESCRIPTION="KDE MSN Messenger"
-SRC_URI="mirror://sourceforge/kmerlin/${MY_P}.tar.gz"
-HOMEPAGE="http://kmerlin.olsd.de"
-S=${WORKDIR}/${MY_P}
-LICENSE="GPL-2"
-KEYWORDS="x86"
diff --git a/net-im/kmerlin/kmerlin-1.0-r1.ebuild b/net-im/kmerlin/kmerlin-1.4.2.ebuild
index df12362a6876..fbf09d49ea30 100644
--- a/net-im/kmerlin/kmerlin-1.0-r1.ebuild
+++ b/net-im/kmerlin/kmerlin-1.4.2.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kmerlin/kmerlin-1.0-r1.ebuild,v 1.9 2004/03/14 17:25:38 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kmerlin/kmerlin-1.4.2.ebuild,v 1.1 2004/04/16 13:47:08 caleb Exp $
 
 inherit kde
 
-need-kde 3
-# despite being a kde3 app, its configure script was generated by autoconf 2.13 so:
-need-autoconf 2.1
+need-kde 3.1 # uses kpassivepopup.h
 
+IUSE=""
 DESCRIPTION="KDE MSN Messenger"
 SRC_URI="mirror://sourceforge/kmerlin/${P}.tar.gz"
 HOMEPAGE="http://kmerlin.olsd.de"
-
-
 LICENSE="GPL-2"
-KEYWORDS="x86"
+KEYWORDS="~x86 ~sparc"
+
+PATCHES="${FILESDIR}/${P}-docbook.diff" # close bug #14285