Added a patch to compile Version 1.7.2. Closes bug #39208. Also corrected

ebuild to not redefine DEPEND in RDEPEND and to make use of the use-flag
'imagemagick'.

4 files changed, 33 insertions, 9 deletions

diff --git a/app-text/kbarcode/ChangeLog b/app-text/kbarcode/ChangeLog
index 35dc8bacb621..e5f7d9a0fc16 100644
--- a/app-text/kbarcode/ChangeLog
+++ b/app-text/kbarcode/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/kbarcode
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/kbarcode/ChangeLog,v 1.14 2004/02/29 18:10:25 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/kbarcode/ChangeLog,v 1.15 2004/03/06 23:37:27 centic Exp $
+
+  07 Mar 2004; root <centic@gentoo.org> kbarcode-1.7.2.ebuild,
+  files/kbarcode-1.7.2-default-parameter.patch:
+  Added a patch to compile Version 1.7.2. Closes bug #39208. Also corrected
+  ebuild to not redefine DEPEND in RDEPEND and to make use of the use-flag
+  'imagemagick'.
 
 *kbarcode-1.6.2 (10 Feb 2004)
 
diff --git a/app-text/kbarcode/Manifest b/app-text/kbarcode/Manifest
index f67dd61c7733..d4b7a4d42b9f 100644
--- a/app-text/kbarcode/Manifest
+++ b/app-text/kbarcode/Manifest
@@ -1,12 +1,13 @@
+MD5 df858c1185696155cc13d2814539b808 ChangeLog 2561
+MD5 266e78a1057599daeae8c8f9a7a58e1b kbarcode-1.6.0.ebuild 781
+MD5 69c1462512d963f769362d322cb0cded kbarcode-1.6.1.ebuild 808
 MD5 239035865cc78c0cf2206e70cedac0f8 kbarcode-1.6.2.ebuild 803
 MD5 fe3d564401fc49f98db91a01ab4bd386 kbarcode-1.7.0.ebuild 803
-MD5 e33295962af6c70a4cbef8ab65ff8c8f kbarcode-1.7.2.ebuild 532
-MD5 69c1462512d963f769362d322cb0cded kbarcode-1.6.1.ebuild 808
-MD5 266e78a1057599daeae8c8f9a7a58e1b kbarcode-1.6.0.ebuild 781
-MD5 4c284cd539617c351190ab589a5c7e69 ChangeLog 2281
+MD5 aedee0024da1db3dc5acc321bb21f696 kbarcode-1.7.2.ebuild 632
 MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162
 MD5 f870e659316d155ee5f14fc2c4059464 files/digest-kbarcode-1.6.0 136
 MD5 823532b4422cb0a198cb07d33e49a38e files/digest-kbarcode-1.6.1 136
 MD5 0cad5178ccab263004d5690481112731 files/digest-kbarcode-1.6.2 136
 MD5 e2e6bede3cfe5f531fcc289497393f5a files/digest-kbarcode-1.7.0 136
 MD5 92f86ba9603288cbc2019022a4c4bcb7 files/digest-kbarcode-1.7.2 66
+MD5 0d1849d1ea9bd928f0e4db105ea92d9c files/kbarcode-1.7.2-default-parameter.patch 762
diff --git a/app-text/kbarcode/files/kbarcode-1.7.2-default-parameter.patch b/app-text/kbarcode/files/kbarcode-1.7.2-default-parameter.patch
new file mode 100644
index 000000000000..aabc89e3ccdb
--- /dev/null
+++ b/app-text/kbarcode/files/kbarcode-1.7.2-default-parameter.patch
@@ -0,0 +1,12 @@
+diff -ur /var/tmp/portage/kbarcode-1.7.2/work/kbarcode-1.7.2/kbarcode/smalldialogs.cpp /tmp/kbarcode-1.7.2/kbarcode/smalldialogs.cpp
+--- /var/tmp/portage/kbarcode-1.7.2/work/kbarcode-1.7.2/kbarcode/smalldialogs.cpp	2004-01-17 11:28:48.000000000 +0100
++++ /tmp/kbarcode-1.7.2/kbarcode/smalldialogs.cpp	2004-03-07 09:34:28.018627744 +0100
+@@ -64,7 +64,7 @@
+     init();
+ }
+ 
+-AddItemsDialog::AddItemsDialog( const QString & a, const QString & g, int c, QWidget* parent = 0, const char* name = 0 )
++AddItemsDialog::AddItemsDialog( const QString & a, const QString & g, int c, QWidget* parent /* = 0*/, const char* name /*= 0*/ )
+     : KDialogBase( KDialogBase::Plain, i18n("Edit Item"),
+       KDialogBase::Ok| KDialogBase::Close, KDialogBase::Ok, parent,name)
+ {
diff --git a/app-text/kbarcode/kbarcode-1.7.2.ebuild b/app-text/kbarcode/kbarcode-1.7.2.ebuild
index e034175297a8..33d47537311a 100644
--- a/app-text/kbarcode/kbarcode-1.7.2.ebuild
+++ b/app-text/kbarcode/kbarcode-1.7.2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/kbarcode/kbarcode-1.7.2.ebuild,v 1.1 2004/01/22 02:35:59 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/kbarcode/kbarcode-1.7.2.ebuild,v 1.2 2004/03/06 23:37:27 centic Exp $
 
 inherit kde
 need-kde 3
 
-IUSE=""
+IUSE="imagemagick"
 DESCRIPTION="A KDE 3.x solution for barcode handling."
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://www.kbarcode.net/"
@@ -14,6 +14,11 @@ KEYWORDS="~x86"
 
 DEPEND=">=kde-base/kdelibs-3
 	>=app-text/barcode-0.98"
-RDEPEND="$DEPEND
-	media-gfx/imagemagick"
+
+RDEPEND="imagemagick? ( media-gfx/imagemagick )"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-default-parameter.patch
+}