Added revbump and patch for use with mono-2.8; specified correct dependencies for -r0 and -r1 (bug 341497)

Package-Manager: portage-2.1.9.35/cvs/Linux x86_64

5 files changed, 119 insertions, 21 deletions

diff --git a/kde-base/kdebindings-csharp/ChangeLog b/kde-base/kdebindings-csharp/ChangeLog
index a4d217df449c..fd505060368b 100644
--- a/kde-base/kdebindings-csharp/ChangeLog
+++ b/kde-base/kdebindings-csharp/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kdebindings-csharp
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings-csharp/ChangeLog,v 1.47 2011/01/26 20:28:54 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings-csharp/ChangeLog,v 1.48 2011/01/28 17:33:47 dilfridge Exp $
+
+*kdebindings-csharp-4.4.5-r1 (28 Jan 2011)
+
+  28 Jan 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  kdebindings-csharp-4.4.5.ebuild, +kdebindings-csharp-4.4.5-r1.ebuild,
+  +files/kdebindings-csharp-4.4.5-mono-2.8.patch:
+  Added revbump and patch for use with mono-2.8; specified correct 
+  dependencies for -r0 and -r1 (bug 341497)
 
 *kdebindings-csharp-4.6.0 (26 Jan 2011)
 
diff --git a/kde-base/kdebindings-csharp/Manifest b/kde-base/kdebindings-csharp/Manifest
index 52a89128e05e..9f1525d58255 100644
--- a/kde-base/kdebindings-csharp/Manifest
+++ b/kde-base/kdebindings-csharp/Manifest
@@ -1,29 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX kdebindings-csharp-4.4.1-make-stuff-optional.patch 1660 RMD160 fcb7f8fb159383180560517463df81d2c964c9ae SHA1 d373fd84c63225f1fd41b96ffa492c5f1da3d71a SHA256 88dabb10a0aa38a2c28b69a3ed15f93a6ce0ee0d7984a5909967cbd174924f9c
+AUX kdebindings-csharp-4.4.5-mono-2.8.patch 1037 RMD160 e8c5b7e2402081c497423faff4cc09d46069c949 SHA1 caf1687aaaa1545b71687f4179fd7bc7933a5860 SHA256 372a1564ec15e37505e5cc80f53b1074d5e00485528caad2fbe7eecc26866397
 DIST kdebindings-4.4.5.tar.bz2 5092007 RMD160 057cafc1922a5ab3999e6dcc532d656dd4cf446c SHA1 2f041c5b050da879e8f5d09f668b56881f9f1bb2 SHA256 c443b59fc4b5fd480bc112c409ac2378147853a59292a8a8404c2243379a1451
 DIST kdebindings-4.5.5.tar.bz2 7134992 RMD160 c69f387c8dd5e3205fa8a436cc63cecf9511f38e SHA1 5f754f0b6989df9557c5ccec18b4f96207fceb94 SHA256 7bfa2df7e8a01c7f1a9cfd2e79e544794b94490d3ca3576cbbedb2328ef257c5
 DIST kdebindings-4.6.0.tar.bz2 7077714 RMD160 7f58d14cfa93b72a3201b143d78d4fc7ba8b404d SHA1 a2d641bbee7fddfbd76652fb41cd784d8c92288c SHA256 cf8e9fa0df35b15f768f4ccb4ee9f55b2a4c3e096608312c1c2936e5f3dbeff5
-EBUILD kdebindings-csharp-4.4.5.ebuild 1955 RMD160 1388315be9e07ad8ccf13979ef3d088cbc270853 SHA1 f7c356b2e14c3b06bc0546679192265e73c7091c SHA256 9d69f151d66b6a13957049cd8b0da0d2520a99be0e28088d0d05934fcf53ebd7
+EBUILD kdebindings-csharp-4.4.5-r1.ebuild 2002 RMD160 e3ce8ca797617cb5de5ded2327c811e02a33c8f8 SHA1 67372d09bfb7349516b83a8cf3eec661ae5d2034 SHA256 bff6521db19acd833fa7df49010e6330c6aab15007b7c8e6149bb39a27300e96
+EBUILD kdebindings-csharp-4.4.5.ebuild 1960 RMD160 af0f6432ddbc778632918919da69e699c5c11b4a SHA1 917e2db5c3a9f537d8639fc27f04f2172b4ce3a2 SHA256 b31b4ed5517c969ecfac6d198ea6660f06baa4768364da38cebe80e21062af08
 EBUILD kdebindings-csharp-4.5.5.ebuild 1523 RMD160 059820ac003e7ddded0ac0f4e7a1f22c3c559a0e SHA1 79e50b835ded9ee73fc29e4c1f51de3e115be8c0 SHA256 b3eab30567dc27487c14ad074540fb0abc01611ed698aeca6c84b96c10a422ae
 EBUILD kdebindings-csharp-4.6.0.ebuild 1520 RMD160 fabb58988e639dc99733ef348d5a1899ca225bfe SHA1 207f60a3e46f6c6d4e830b553b1608df454a8b32 SHA256 de2cce059d4c8b6ac7215c37813ec930dd521ba1cf78a72aea0274ca54c9f1c2
-MISC ChangeLog 7030 RMD160 b1a342d9a1c8a875d8bc75eaa7b36e10245ab633 SHA1 6cded4fc1ef3f9f314212a19bc1e0fd18355ea58 SHA256 9a0cc903d3731b433dd99885cbcd39f954867526ebc74c0c2a78952af9764b63
+MISC ChangeLog 7369 RMD160 00c02ee21b1e585671d499cb5bc40fdc9172ceb3 SHA1 93ceab6e81450d66f11a02b64ad9f5ee1154f64b SHA256 a54ef982ac39d28886145e7e616e856c0dbdae34b46a9f6e2952c00772cfe02f
 MISC metadata.xml 602 RMD160 0e158f6f29d4a3c37e8013ee418e17cc87783823 SHA1 9074537b8ee5c3d3b882c0704a99433a73aa888e SHA256 34098292938931b570737accb01f4f124e79a7b1bfa2a59079fa51bdee3d24a5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQIcBAEBCAAGBQJNQIUCAAoJEOf+E+/4L5LmelQP/03VnUvvl+yIrZDnSP5QREMp
-C0cd8+m6xhIExEYaocXQsmCgW7EHzm/0LOTQ+5P9sLNxox98jZjmSROh/gxEoIbG
-kT+rwK+xKd2EdLNG+ETQWVTwJS/nc1N817p8wEPCkJt8tPQR4mlmduz3OSa8yynE
-z3i+iqpfcHfjskF21mbj5wHDv9y4v55l+bhB+JTkvx0T2fOQw4GOitn7jw4CbVqI
-XOEm1PuGhbvCYD06PpxeN++Tj+H0RbSVxr2+/AhuV0C44Omtu2aMCw389bk0ZpCi
-6r1CSqqKWK5PmVO5gY58wfHgswVz2gEhrNbKFntl3afczhg+IdLU1nyfZqELLHKJ
-Z2HylViJD4QkOJRkNWDNKFq1jzVfwhgP1DYnnZKQubSBZvWl9X4pVXmQHbJTJ1mx
-x9wYKuSGIG5b7gVsSfO5hh0yAlXTS6WIy0UyRjIaK13J+TKnjG3G9+QBrqIAURsB
-7CvkOy/+ryP5rIpgw95vX1mNChdgs39SmMdhajBFqXxl9epVI+HfGOgF9w7zFsvv
-Mxn/XrkUb1p49YBuCtAJ7Ww2SClLJ5/E0+vAYV+r9QAnNP1KTajhK34Z7IyGVRRL
-8iV0sk7UGwYJb9VBL16foDien37KkoQt1zdz1sKyZQnbUbV/eLj4Ebnc6eAgQPvr
-xEDP3yNGCwYNzzwEJr1C
-=xH/4
+iQIcBAEBAgAGBQJNQv3oAAoJENwGBM22xffeTFAP/1bBk0fqbdFMdg0pOShkjoJu
+koM5egD1Ia1DOdXf7QbMm//Jnk/y9MCAnxoPI/XlGKa5FotYGNC60mQRwBljT4iR
+BV+ndPWgnu1RO5VQc6Q+l6qo3QGCtd9L+5wu6qQfWgG8RAyNaPzd5KvaymY2aE8y
+EiF6NULLlhIwnKG5y167RWbeSc1V0AD0SlOYhRIjlWC2zvs/3dT56dpcbLMv1ha/
+IQzM7vMOVvaYo0532qbaPn+luMeXdhQ1tyMtn7M1bj06VGT6A1JNvpUWzDx3deiY
+TBtiAXN8aDHl0pk+jeBXCU8nyJ1RM0VIDHFMtVy+hphdQCwk8aZ2Z73mPFLqRud3
+T1u8VN6p06XgBid0TrZVCE9M45vrnSvKXBGbs/VY4kqLsMrdGEC4+tW/6phrgw1C
+NFlW0MhxbBs62hQEzsoHoka97WWc3F8j8HhAdkkU/TkqCTWgBcrwYQOo5bKZVZnH
+Wdwkx6b+Hgo2DKhP0aDHIvCf7qDibBYt/Mqb+fK7LJKyNT3Y69qzQkKeVZKmguq2
+Ot396s42tId5CdqHpdhR/FU1ofTQYoFrTwiUKaP+MWSW9GdTlg8d7RJEtoZBYZNv
+imbW+5OhoCx3y6MQev8mb2jEsCAm6DFKpkAl1jKs2EjMp4aGK6qb0fx7aVnMTMeB
+uJ2PHgltq7d8CZzWEilR
+=RcZN
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdebindings-csharp/files/kdebindings-csharp-4.4.5-mono-2.8.patch b/kde-base/kdebindings-csharp/files/kdebindings-csharp-4.4.5-mono-2.8.patch
new file mode 100644
index 000000000000..32674c668d41
--- /dev/null
+++ b/kde-base/kdebindings-csharp/files/kdebindings-csharp-4.4.5-mono-2.8.patch
@@ -0,0 +1,23 @@
+diff -uar kdebindings-4.4.5-orig/csharp/kimono/CMakeLists.txt kdebindings-4.4.5/csharp/kimono/CMakeLists.txt
+--- kdebindings-4.4.5-orig/csharp/kimono/CMakeLists.txt	2010-10-24 16:11:27.000000000 +0200
++++ kdebindings-4.4.5/csharp/kimono/CMakeLists.txt	2010-10-24 16:12:17.000000000 +0200
+@@ -22,7 +22,7 @@
+                       ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS})
+ 
+ # write FindPackage modules for these
+-pkg_search_module(MONO mono)
++pkg_search_module(MONO mono-2 mono)
+ pkg_search_module(GLIB2 glib-2.0)
+ 
+ # if libmono-dev is not installed, then MONO_INCLUDES is not defined and compiling
+diff -uar kdebindings-4.4.5-orig/csharp/kimono/src/kimonopluginfactory.cpp kdebindings-4.4.5/csharp/kimono/src/kimonopluginfactory.cpp
+--- kdebindings-4.4.5-orig/csharp/kimono/src/kimonopluginfactory.cpp	2010-10-24 16:11:27.000000000 +0200
++++ kdebindings-4.4.5/csharp/kimono/src/kimonopluginfactory.cpp	2010-10-24 16:12:40.000000000 +0200
+@@ -44,6 +44,7 @@
+ 
+ #include <stdlib.h>
+ #include <stdio.h>
++#include <glib.h>
+ 
+ class QWidget;
+ 
diff --git a/kde-base/kdebindings-csharp/kdebindings-csharp-4.4.5-r1.ebuild b/kde-base/kdebindings-csharp/kdebindings-csharp-4.4.5-r1.ebuild
new file mode 100644
index 000000000000..52accc872b7e
--- /dev/null
+++ b/kde-base/kdebindings-csharp/kdebindings-csharp-4.4.5-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings-csharp/kdebindings-csharp-4.4.5-r1.ebuild,v 1.1 2011/01/28 17:33:47 dilfridge Exp $
+
+EAPI="3"
+
+KMNAME="kdebindings"
+KMMODULE="csharp"
+WEBKIT_REQUIRED="optional"
+inherit kde4-meta mono
+
+DESCRIPTION="C# bindings for KDE and Qt"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="akonadi debug +phonon plasma qimageblitz qscintilla semantic-desktop"
+
+DEPEND="
+	>=dev-lang/mono-2.8
+	$(add_kdebase_dep smoke 'akonadi?,phonon?,qimageblitz?,qscintilla?,semantic-desktop?,webkit?')
+	semantic-desktop? ( >=dev-libs/soprano-2.3.73[clucene] )
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="smoke/"
+
+PATCHES=( "${FILESDIR}"/${PN}-4.4.1-make-stuff-optional.patch
+	"${FILESDIR}/${P}"-mono-2.8.patch )
+
+pkg_setup() {
+	kde4-meta_pkg_setup
+
+	if use plasma && ! use webkit; then
+		eerror
+		eerror "The plasma USE flag requires the webkit USE flag to be enabled."
+		eerror
+		eerror "Please enable webkit or disable plasma."
+		die "plasma requires webkit"
+	fi
+}
+
+src_prepare() {
+	kde4-meta_src_prepare
+
+	# Disable soprano index (clucene) bindings
+	rm -f csharp/soprano/soprano/Soprano_Index_{CLuceneIndex,IndexFilterModel}.cs || die
+	sed -e 's/\${SOPRANO_INDEX_LIBRARIES}//g' \
+		-i csharp/soprano/CMakeLists.txt || die 'failed to remove clucene from link'
+
+	sed -e "/add_subdirectory( examples )/ s:^:#:" \
+		-i csharp/plasma/CMakeLists.txt || die 'failed to disable examples'
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with akonadi)
+		$(cmake-utils_use_with akonadi KdepimLibs)
+		$(cmake-utils_use_enable plasma PLASMA_SHARP)
+		$(cmake-utils_use_enable phonon PHONON_SHARP)
+		$(cmake-utils_use_enable qimageblitz QIMAGEBLITZ_SHARP)
+		$(cmake-utils_use_enable qscintilla QSCINTILLA_SHARP)
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+		$(cmake-utils_use_enable webkit QTWEBKIT_SHARP)
+	)
+	kde4-meta_src_configure
+}
diff --git a/kde-base/kdebindings-csharp/kdebindings-csharp-4.4.5.ebuild b/kde-base/kdebindings-csharp/kdebindings-csharp-4.4.5.ebuild
index 315870b79aef..ae544220b014 100644
--- a/kde-base/kdebindings-csharp/kdebindings-csharp-4.4.5.ebuild
+++ b/kde-base/kdebindings-csharp/kdebindings-csharp-4.4.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings-csharp/kdebindings-csharp-4.4.5.ebuild,v 1.4 2010/08/09 17:34:38 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings-csharp/kdebindings-csharp-4.4.5.ebuild,v 1.5 2011/01/28 17:33:47 dilfridge Exp $
 
 EAPI="3"
 
@@ -14,7 +14,7 @@ KEYWORDS="amd64 ppc x86"
 IUSE="akonadi debug +phonon plasma qimageblitz qscintilla semantic-desktop"
 
 DEPEND="
-	dev-lang/mono
+	<dev-lang/mono-2.8
 	$(add_kdebase_dep smoke 'akonadi?,phonon?,qimageblitz?,qscintilla?,semantic-desktop?,webkit?')
 	semantic-desktop? ( >=dev-libs/soprano-2.3.73[clucene] )
 "