KDE 3.4.2 split ebuilds. p.masked, to be unmasked shortly.

Package-Manager: portage-2.0.51.22-r2

5 files changed, 85 insertions, 3 deletions

diff --git a/kde-base/kooka/ChangeLog b/kde-base/kooka/ChangeLog
index 1165cbd76107..543e9f463005 100644
--- a/kde-base/kooka/ChangeLog
+++ b/kde-base/kooka/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kooka
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kooka/ChangeLog,v 1.11 2005/07/08 04:00:51 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kooka/ChangeLog,v 1.12 2005/07/28 21:16:20 danarmak Exp $
+
+*kooka-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org>
+  +files/configure-fix-kdegraphics-kadmos.patch, +kooka-3.4.2.ebuild:
+  Version bump to 3.4.2.
 
   08 Jul 2005; Jason Wever <weeve@gentoo.org> kooka-3.4.1.ebuild:
   Stable on SPARC.
diff --git a/kde-base/kooka/Manifest b/kde-base/kooka/Manifest
index 8e178e6e3a6d..83adc8ebc803 100644
--- a/kde-base/kooka/Manifest
+++ b/kde-base/kooka/Manifest
@@ -1,7 +1,10 @@
-MD5 4007c88fa3028d8ab8c2686e6129493a ChangeLog 1835
-MD5 49e20903a35f520bc93eb5e236eaaa79 kooka-3.4.0.ebuild 572
 MD5 36d15adfe725cf4c247aea78f10877e4 kooka-3.4.1.ebuild 663
+MD5 49e20903a35f520bc93eb5e236eaaa79 kooka-3.4.0.ebuild 572
+MD5 5cbb09037c80d3dea86f0e21d1f5613c kooka-3.4.2.ebuild 1013
+MD5 4007c88fa3028d8ab8c2686e6129493a ChangeLog 1835
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 51a35089fe1f6247f9cf221c77a57177 files/configure-fix-kdegraphics-kadmos.patch 1714
 MD5 e48f24f251a08d557aee3f0d60feb26d files/digest-kooka-3.4.0 71
 MD5 1334abaee53983ad0a0810adeafef453 files/digest-kooka-3.4.1 221
+MD5 a603b1f40c870db682665f57f908df0e files/digest-kooka-3.4.2 71
 MD5 0abb98c262645006a4b116c0635edb49 files/kdegraphics-3.4.1-gocr.patch 454
diff --git a/kde-base/kooka/files/configure-fix-kdegraphics-kadmos.patch b/kde-base/kooka/files/configure-fix-kdegraphics-kadmos.patch
new file mode 100644
index 000000000000..1f0334b99ef9
--- /dev/null
+++ b/kde-base/kooka/files/configure-fix-kdegraphics-kadmos.patch
@@ -0,0 +1,47 @@
+Index: kooka/configure.in.in
+===================================================================
+--- kooka/configure.in.in	(revision 428265)
++++ kooka/configure.in.in	(working copy)
+@@ -2,21 +2,32 @@
+ dnl AC_CHECK_LIB(Pgm2asc,pgm2asc)
+ dnl should define HAVE_LIBPGM2ASC if available
+ 
+-AC_ARG_WITH(kadmos-dir,
+-AC_HELP_STRING([--with-kadmos-dir],[sets the path to the kadmos engine]),
+-	[ac_kadmos_value=$withval], [ac_kadmos_value=NONE])
++AC_ARG_WITH([kadmos],
++  [AS_HELP_STRING([--with-kadmos],
++    [Enable the kadmos OCR engine @<:@default=check@:>@])],
++  [], with_kadmos=check)
+ 
++AC_ARG_WITH([kadmos-dir],
++  AS_HELP_STRING([--with-kadmos-dir],
++    [sets the path to the kadmos engine @<:@default=/usr/local@:>@]),
++  [ac_kadmos_value=$withval], [ac_kadmos_value=/usr/local])
++
+ KADMOS_INC=
+ KADMOS_LIB=
+ 
+-if test -r "$ac_kadmos_value/kadmos.h"; then
+-	KADMOS_INC="-I$ac_kadmos_value"
+-	KADMOS_LIB="$ac_kadmos_value/librep.a"
+-	AC_DEFINE_UNQUOTED(HAVE_KADMOS, 1, [Defines if your system has the kadmos libraries])
+-elif test ! "x$ac_kadmos_value" = "xNONE"; then
+-	AC_MSG_WARN([couldn't find kadmos engine header file under $ac_kadmos_value/kadmos.h])
++if test "x$with_kadmos" != xno; then
++	if test -r "$ac_kadmos_value/kadmos.h"; then
++		KADMOS_INC="-I$ac_kadmos_value"
++		KADMOS_LIB="$ac_kadmos_value/librep.a"
++		AC_DEFINE_UNQUOTED(HAVE_KADMOS, 1, [Defines if your system has the kadmos libraries])
++	else
++		AC_MSG_WARN([couldn't find kadmos engine header file under $ac_kadmos_value/kadmos.h])
++	fi
++
++	if test "x$with_kadmos" != xcheck && test -z "$KADMOS_LIB"; then
++		AC_MSG_FAILURE([--with-kadmos was given, but test for kadmos failed])
++	fi
+ fi
+ 
+ AC_SUBST(KADMOS_LIB)
+ AC_SUBST(KADMOS_INC)
+-
diff --git a/kde-base/kooka/files/digest-kooka-3.4.2 b/kde-base/kooka/files/digest-kooka-3.4.2
new file mode 100644
index 000000000000..80c5b0d96ab2
--- /dev/null
+++ b/kde-base/kooka/files/digest-kooka-3.4.2
@@ -0,0 +1 @@
+MD5 50916460952c4142329a7c6a47fe1530 kdegraphics-3.4.2.tar.bz2 6579227
diff --git a/kde-base/kooka/kooka-3.4.2.ebuild b/kde-base/kooka/kooka-3.4.2.ebuild
new file mode 100644
index 000000000000..888fcc3087e8
--- /dev/null
+++ b/kde-base/kooka/kooka-3.4.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kooka/kooka-3.4.2.ebuild,v 1.1 2005/07/28 21:16:20 danarmak Exp $
+
+KMNAME=kdegraphics
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta eutils
+
+DESCRIPTION="Kooka is a KDE application which provides access to scanner hardware"
+KEYWORDS=" ~amd64 ~ppc ~sparc ~x86"
+IUSE="kadmos"
+DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkscan)"
+OLDDEPEND="~kde-base/libkscan-$PV"
+
+KMCOPYLIB="libkscan libkscan"
+KMEXTRACTONLY="libkscan"
+
+# Fix detection of gocr (kde bug 90082). Applied to trunk upstream, but not backported to branch as of 3.4.2.
+PATCHES1="${FILESDIR}/kdegraphics-3.4.1-gocr.patch"
+
+# There's no ebuild for kadmos, and likely will never be since it isn't free, but you can enable this use flag
+# to compile against the kadmos headers you installed yourself
+PATCHES="$FILESDIR/configure-fix-kdegraphics-kadmos.patch"
+myconf="$myconf $(use_with kadmos)"