Fix bug 275069.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

6 files changed, 99 insertions, 2 deletions

diff --git a/kde-base/kdesdk-scripts/ChangeLog b/kde-base/kdesdk-scripts/ChangeLog
index 768db5dbfd5e..93b810610e10 100644
--- a/kde-base/kdesdk-scripts/ChangeLog
+++ b/kde-base/kdesdk-scripts/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for kde-base/kdesdk-scripts
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-scripts/ChangeLog,v 1.106 2009/08/04 00:23:46 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-scripts/ChangeLog,v 1.107 2009/08/16 19:25:11 idl0r Exp $
+
+*kdesdk-scripts-4.3.0-r1 (16 Aug 2009)
+*kdesdk-scripts-4.2.4-r1 (16 Aug 2009)
+*kdesdk-scripts-3.5.10-r1 (16 Aug 2009)
+*kdesdk-scripts-3.5.9-r1 (16 Aug 2009)
+
+  16 Aug 2009; Christian Ruppert <idl0r@gentoo.org>
+  +kdesdk-scripts-3.5.9-r1.ebuild, +kdesdk-scripts-3.5.10-r1.ebuild,
+  +kdesdk-scripts-4.2.4-r1.ebuild, +kdesdk-scripts-4.3.0-r1.ebuild:
+  Fix bug 275069.
 
 *kdesdk-scripts-4.3.0 (04 Aug 2009)
 
diff --git a/kde-base/kdesdk-scripts/Manifest b/kde-base/kdesdk-scripts/Manifest
index 94981ed27b74..bf008c584505 100644
--- a/kde-base/kdesdk-scripts/Manifest
+++ b/kde-base/kdesdk-scripts/Manifest
@@ -2,9 +2,13 @@ DIST kdesdk-3.5.10.tar.bz2 5252055 RMD160 28a296667d66021c3b13c1991e1028d5e8554d
 DIST kdesdk-3.5.9.tar.bz2 5250576 RMD160 afb9f26bae17ec4e43db51855e19f5cd88a70e6c SHA1 8e968591d37f770e8dc8aad43e696d3e44f8e2d0 SHA256 dabb5fe471381b8ac50996ca16869e5ae400826166dadce51044990faa088179
 DIST kdesdk-4.2.4.tar.bz2 5477177 RMD160 b42311a6c1f2298b01e8a705ac8d83ec0d2c71a5 SHA1 ad5a00f5ee4ae0f627b971b7413edb0550e92db1 SHA256 727f2d3d75298a30fcc9c8f34972ffa306cfec5b0193ad9c2d951809bc7539e4
 DIST kdesdk-4.3.0.tar.bz2 5609237 RMD160 c3976e18e5566a971c770f6c47614eb3d3802a0a SHA1 41523dc3f1370ec2bee872d40fdf9f45ad872077 SHA256 24f207cb89467c0eaa6f66d25f1c42f5f4b80e5605571068a1e1e0cb6c76a04f
+EBUILD kdesdk-scripts-3.5.10-r1.ebuild 588 RMD160 797a63d2fc76a6de1fb36749a2c19a4a8efeb277 SHA1 278c203375d66d66cf6732e6dc053f44092505dc SHA256 3a6adbe1044c4d94aea3982fc306744933167f5f8e07ba612b7101bad599dfac
 EBUILD kdesdk-scripts-3.5.10.ebuild 462 RMD160 7fb6c020db48ad17af2ee4916617ba99e269d918 SHA1 45cf162bb2e99e4e9552d2bfdd0697cedfdb7902 SHA256 6c26843555091b0f5e600e12d700226a01d1a01205609c3151b866aaca2352a0
+EBUILD kdesdk-scripts-3.5.9-r1.ebuild 587 RMD160 8737c898371c35a181d47c469d491b2ac0abb816 SHA1 7b20f014d3bdab573a017ff73c31275aebc3040f SHA256 85cf3aa26aeeaccbcd2a76d19899f583c5c5d101a5499042e0c494c867397e3c
 EBUILD kdesdk-scripts-3.5.9.ebuild 460 RMD160 60ea6e7ca8a3447db93d6dfec6f442016e755b24 SHA1 602fc9ab3b04ffccc91e54ef6e0b61a5e8ab4f75 SHA256 81a21e8736f76d775c3d9a0fae62714a22a213bd7e2b21395b0dd5e800e1b276
+EBUILD kdesdk-scripts-4.2.4-r1.ebuild 809 RMD160 4e7635b337fff3ed5355847cc935f392cabf421d SHA1 f7a4a669198f58730bb1377ef9e7728a8c95ed35 SHA256 f93b87a93a1c0c34c3ff79eced67e6bba6cb3cba76d3006ed124c30d2b67a5cc
 EBUILD kdesdk-scripts-4.2.4.ebuild 736 RMD160 3fbd07975b1f112fe1433d0e2becc0ecf809f6ec SHA1 d942890779154fdbed9a9d87a4d08ebbc40f4edd SHA256 c9ee1b7dd3342d78f6e5a2a694f0f7a69ca25b15e77624a8ba69189ddbc16624
+EBUILD kdesdk-scripts-4.3.0-r1.ebuild 526 RMD160 1c743e795ae5687d3a544bc6362e59175ca3c65c SHA1 10fd8045f09b5d3bdcad5ebfef8b069cccc54547 SHA256 f8208bee561a3e814b48ef367ce84e76e39b2b86d3fa5404e157532a5e29f8f1
 EBUILD kdesdk-scripts-4.3.0.ebuild 410 RMD160 f59c47e4d49c3fe2af9fdd2ab4d3fb1897483f7b SHA1 973d4efe35cb3212ba44c7d10e07d799a4650b94 SHA256 4bb0ef9b9b544c21f25d6c8835bad9659cec51acdd1412a3772919654c17a64e
-MISC ChangeLog 13997 RMD160 fd5e9879019de6f52c2554d37750e556e421b13c SHA1 3d8ff39d58113b6a31499b4decf22a2a5094b999 SHA256 3b17015983abf7275227d2867a4290a1b513b12bbc5e59f5740764919e1e8017
+MISC ChangeLog 14363 RMD160 5465d95b68cd3d909c2e4f8ab5e431f6b6f2cdeb SHA1 dd2b19f45aee98f8931fa90bf954ef534f2ae981 SHA256 9b98f30a0d920868d426cf4345b6f40628c7c244192f80b357b20e593a3a724f
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/kdesdk-scripts/kdesdk-scripts-3.5.10-r1.ebuild b/kde-base/kdesdk-scripts/kdesdk-scripts-3.5.10-r1.ebuild
new file mode 100644
index 000000000000..66321b5bf227
--- /dev/null
+++ b/kde-base/kdesdk-scripts/kdesdk-scripts-3.5.10-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-scripts/kdesdk-scripts-3.5.10-r1.ebuild,v 1.1 2009/08/16 19:25:11 idl0r Exp $
+
+KMNAME=kdesdk
+KMMODULE="scripts"
+EAPI="1"
+inherit kde-meta
+
+DESCRIPTION="Kdesdk Scripts - Some useful scripts for the development of applications"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+src_unpack() {
+	kde-meta_src_unpack
+
+	# bug 275069
+	sed -rie 's:color(cvs(rc-sample)?|svn)::g' scripts/Makefile.am || die
+}
diff --git a/kde-base/kdesdk-scripts/kdesdk-scripts-3.5.9-r1.ebuild b/kde-base/kdesdk-scripts/kdesdk-scripts-3.5.9-r1.ebuild
new file mode 100644
index 000000000000..2deb68ddc73a
--- /dev/null
+++ b/kde-base/kdesdk-scripts/kdesdk-scripts-3.5.9-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-scripts/kdesdk-scripts-3.5.9-r1.ebuild,v 1.1 2009/08/16 19:25:11 idl0r Exp $
+
+KMNAME=kdesdk
+KMMODULE="scripts"
+EAPI="1"
+inherit kde-meta
+
+DESCRIPTION="Kdesdk Scripts - Some useful scripts for the development of applications"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+src_unpack() {
+	kde-meta_src_unpack
+
+	# bug 275069
+	sed -rie 's:color(cvs(rc-sample)?|svn)::g' scripts/Makefile.am || die
+}
diff --git a/kde-base/kdesdk-scripts/kdesdk-scripts-4.2.4-r1.ebuild b/kde-base/kdesdk-scripts/kdesdk-scripts-4.2.4-r1.ebuild
new file mode 100644
index 000000000000..e6c47b5126a1
--- /dev/null
+++ b/kde-base/kdesdk-scripts/kdesdk-scripts-4.2.4-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-scripts/kdesdk-scripts-4.2.4-r1.ebuild,v 1.1 2009/08/16 19:25:11 idl0r Exp $
+
+EAPI="2"
+
+KMNAME="kdesdk"
+KMMODULE="scripts"
+inherit kde4-meta
+
+DESCRIPTION="Kdesdk Scripts - Some useful scripts for the development of applications"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="debug +handbook"
+
+src_prepare() {
+	# Disable hardcoded kdepimlibs check - only 4.2 branch is affected
+	sed -i -e 's/find_package(KdepimLibs REQUIRED)/macro_optional_find_package(KdepimLibs)/' \
+		CMakeLists.txt || die "failed to disable kdepimlibs hardcoded check"
+
+	# bug 275069
+	sed -i -e 's:colorsvn::' scripts/CMakeLists.txt || die
+
+	kde4-meta_src_prepare
+}
diff --git a/kde-base/kdesdk-scripts/kdesdk-scripts-4.3.0-r1.ebuild b/kde-base/kdesdk-scripts/kdesdk-scripts-4.3.0-r1.ebuild
new file mode 100644
index 000000000000..be3d93052ff2
--- /dev/null
+++ b/kde-base/kdesdk-scripts/kdesdk-scripts-4.3.0-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-scripts/kdesdk-scripts-4.3.0-r1.ebuild,v 1.1 2009/08/16 19:25:11 idl0r Exp $
+
+EAPI="2"
+
+KMNAME="${PN/-*/}"
+KMMODULE="${PN/*-/}"
+
+inherit kde4-meta
+
+DESCRIPTION="KDE SDK Scripts"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="+handbook debug"
+
+src_prepare() {
+	# bug 275069
+	sed -i -e 's:colorsvn::' scripts/CMakeLists.txt || die
+
+	kde4-meta_src_prepare
+}