latest version - minor ebuild fixes

5 files changed, 44 insertions, 28 deletions

diff --git a/app-text/kbarcode/ChangeLog b/app-text/kbarcode/ChangeLog
index 2dc3e36bf6a5..cbd3e5348d54 100644
--- a/app-text/kbarcode/ChangeLog
+++ b/app-text/kbarcode/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/kbarcode
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/kbarcode/ChangeLog,v 1.7 2003/12/17 13:05:53 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/kbarcode/ChangeLog,v 1.8 2003/12/26 13:13:03 caleb Exp $
+
+*kbarcode-1.6.0 (26 Dec 2003)
+
+  26 Dec 2003; Caleb Tennis <caleb@gentoo.org> kbarcode-1.6.0.ebuild,
+  kbarcode-1.6.0_rc2.ebuild:
+  Latest version, minor ebuild fixes
 
 *kbarcode-1.6.0_rc2 (17 Dec 2003)
 
diff --git a/app-text/kbarcode/Manifest b/app-text/kbarcode/Manifest
index 3cba41e76347..c63803eeb8ef 100644
--- a/app-text/kbarcode/Manifest
+++ b/app-text/kbarcode/Manifest
@@ -1,9 +1,8 @@
-MD5 fab7dd270473e219b60862c6a4a50a1e kbarcode-1.6.0_rc2.ebuild 598
 MD5 7b6bf2cf88da74aed8af5b276cdbc7ad kbarcode-1.2.1.ebuild 490
 MD5 413f4c33b29d0e9923cb19525d9db996 kbarcode-1.5.5.ebuild 555
-MD5 bc24feeb3f6f166919a19fedb4774a24 kbarcode-1.6.0.ebuild 556
+MD5 bca3e967a1f478389fc2519fb0271329 kbarcode-1.6.0.ebuild 781
 MD5 cfbbfddb2e9a421f97f51ac5696423b5 kbarcode-1.2.0.ebuild 489
-MD5 0b444d4afb0c731b70ec11da2734a3ce ChangeLog 1238
+MD5 f76b039dfbc933cbbbb4e4b287462e2e ChangeLog 1406
 MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162
 MD5 70c6a14dcc503d3ae53eab5c4943d3c0 kbarcode-1.5.4.ebuild 555
 MD5 0ac808b9629d1ec8288e8f0e8e33434e files/digest-kbarcode-1.2.0 66
@@ -11,4 +10,3 @@ MD5 553f4a3e013763ebe62e0614abd0a157 files/digest-kbarcode-1.2.1 66
 MD5 882adaa37165d394a276210907ca619f files/digest-kbarcode-1.5.4 136
 MD5 49a54155431743316e2fa7237f3137ab files/digest-kbarcode-1.5.5 136
 MD5 f870e659316d155ee5f14fc2c4059464 files/digest-kbarcode-1.6.0 136
-MD5 2064344c0e85c8c4bc157fdd4434fd3c files/digest-kbarcode-1.6.0_rc2 139
diff --git a/app-text/kbarcode/files/digest-kbarcode-1.6.0_rc2 b/app-text/kbarcode/files/digest-kbarcode-1.6.0
index a4663230e634..4357e577d61d 100644
--- a/app-text/kbarcode/files/digest-kbarcode-1.6.0_rc2
+++ b/app-text/kbarcode/files/digest-kbarcode-1.6.0
@@ -1,2 +1,2 @@
-MD5 9db01e3d36242c4f3a875b4f0b980108 kbarcode-1.6.0rc2.tar.gz 950590
+MD5 4897343b563f5daf00169d8e051f1b31 kbarcode-1.6.0.tar.gz 943392
 MD5 0376d08108227d3197515a0a11a3b44d kfile_kbarcode-0.1.tar.gz 541103
diff --git a/app-text/kbarcode/kbarcode-1.6.0.ebuild b/app-text/kbarcode/kbarcode-1.6.0.ebuild
new file mode 100644
index 000000000000..4da2bb30afa5
--- /dev/null
+++ b/app-text/kbarcode/kbarcode-1.6.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/kbarcode/kbarcode-1.6.0.ebuild,v 1.1 2003/12/26 13:13:03 caleb Exp $
+
+inherit kde
+need-kde 3
+
+IUSE="mysql"
+
+DESCRIPTION="A KDE 3.x solution for barcode handling."
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	mirror://sourceforge/${PN}/kfile_kbarcode-0.1.tar.gz"
+HOMEPAGE="http://www.kbarcode.net/"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+
+newdepend ">=app-text/barcode-0.98"
+RDEPEND="media-gfx/imagemagick"
+
+src_compile()
+{
+	S=${WORKDIR}/${P}
+	kde_src_compile all
+	S=${WORKDIR}/kfile_kbarcode-0.1
+	kde_src_compile all
+}
+
+src_install()
+{
+	S=${WORKDIR}/${P}
+	kde_src_install
+	S=${WORKDIR}/kfile_kbarcode-0.1
+	kde_src_install
+}
diff --git a/app-text/kbarcode/kbarcode-1.6.0_rc2.ebuild b/app-text/kbarcode/kbarcode-1.6.0_rc2.ebuild
deleted file mode 100644
index 174ee77fc94e..000000000000
--- a/app-text/kbarcode/kbarcode-1.6.0_rc2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/kbarcode/kbarcode-1.6.0_rc2.ebuild,v 1.1 2003/12/17 13:05:53 caleb Exp $
-
-inherit kde
-need-kde 3
-
-IUSE="mysql"
-
-MY_P=${P/_/}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="A KDE 3.x solution for barcode handling."
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
-	mirror://sourceforge/${PN}/kfile_kbarcode-0.1.tar.gz"
-HOMEPAGE="http://www.kbarcode.net/"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-
-newdepend ">=app-text/barcode-0.98
-	mysql? ( dev-db/mysql )"
-