Add more keywords; add patch for objc++ support

Package-Manager: portage--svn/cvs/Linux i686

4 files changed, 68 insertions, 9 deletions

diff --git a/kde-base/automoc/ChangeLog b/kde-base/automoc/ChangeLog
index 05613672db7c..886be712e5e4 100644
--- a/kde-base/automoc/ChangeLog
+++ b/kde-base/automoc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/automoc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/automoc/ChangeLog,v 1.21 2010/01/09 06:44:54 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/automoc/ChangeLog,v 1.22 2010/01/13 17:28:09 abcd Exp $
+
+  13 Jan 2010; Jonathan Callen <abcd@gentoo.org> automoc-0.9.88.ebuild,
+  +files/automoc-0.9.88-objc++.patch:
+  Add more keywords; add patch for objc++ support
 
   09 Jan 2010; Jonathan Callen <abcd@gentoo.org> automoc-0.9.88.ebuild:
   Add prefix keywords
diff --git a/kde-base/automoc/Manifest b/kde-base/automoc/Manifest
index a137492e890e..c6246654b288 100644
--- a/kde-base/automoc/Manifest
+++ b/kde-base/automoc/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX automoc-0.9.88-objc++.patch 2971 RMD160 61e847cd6bc021bcb181c61bb47c74aec6399093 SHA1 4522b4767dfd32f27c4bf95243ddad910477ff0c SHA256 6e7a2369b7130aa47b044937df73c2450711b3f6a32b40d8912bfd19a1f53e15
 DIST automoc4-0.9.88.tar.bz2 9153 RMD160 8545f159092c9237f8c0f0f14b0dca9bfeac5c19 SHA1 d864c3dda99d8b5f625b9267acfa1d88ff617e3a SHA256 234116f4c05ae21d828594d652b4c4a052ef75727e2d8a4f3a4fb605de9e4c49
-EBUILD automoc-0.9.88.ebuild 736 RMD160 17f90557337a28f45f427f299e302fe0b831f1d2 SHA1 f1a26e9ebe0c15621a7c5148f580273c60ead6f0 SHA256 2b3f152299520060c22b61a40c4bb2c21daccc5d95afc8f963acf4d9532358df
-MISC ChangeLog 2486 RMD160 c1ba5f7f8c29dc9093eb75473717d2ed950cb12e SHA1 63f589ea9298ee166b2162752e7cc59d3e34b0d9 SHA256 262f36aa79a0b93978adb81fb7976bdf6e65c00f55ec4ec4effe527440c90cb1
+EBUILD automoc-0.9.88.ebuild 851 RMD160 dc12752e96778fff85ffe4c9255cd958fcb31580 SHA1 a48fc3b42880aafd14c953022a142ec0effa89e4 SHA256 cc72dc51551125dc245a208212a58d30491d0b06bf15bfee69ff4a097bdacb67
+MISC ChangeLog 2647 RMD160 78434052482c16a9efb800f8904e36f896bcbe74 SHA1 8c13ae1197437686ae8a6b3525e087674094ed85 SHA256 46d7d4b775b0b23e089ae48f06419429addd83ebdd71007f2b7da823c32928be
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAktIJfEACgkQOypDUo0oQOpRIQCdGh1qYxCIt05jDErYvVcKmq2T
-Rs0AoN2nAW2xjq7QRQcSy+lBxidyAkv+
-=3RKV
+iEYEARECAAYFAktOAroACgkQOypDUo0oQOpOjwCcD2vDXk4Hcw4i3QQMn1+xtVM2
+p5EAoImg/SfraK6edGoAgdYHzNOG51sg
+=ZsN6
 -----END PGP SIGNATURE-----
diff --git a/kde-base/automoc/automoc-0.9.88.ebuild b/kde-base/automoc/automoc-0.9.88.ebuild
index 82ee92fd1c5a..644534e5f913 100644
--- a/kde-base/automoc/automoc-0.9.88.ebuild
+++ b/kde-base/automoc/automoc-0.9.88.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/automoc/automoc-0.9.88.ebuild,v 1.19 2010/01/09 06:44:54 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/automoc/automoc-0.9.88.ebuild,v 1.20 2010/01/13 17:28:09 abcd Exp $
 
 EAPI="2"
 
 MY_PN="automoc4"
 MY_P="$MY_PN-${PV}"
 
-inherit cmake-utils flag-o-matic
+inherit base cmake-utils flag-o-matic
 
 DESCRIPTION="KDE Meta Object Compiler"
 HOMEPAGE="http://www.kde.org"
@@ -15,7 +15,7 @@ SRC_URI="mirror://kde/stable/${MY_PN}/${PV}/${MY_P}.tar.bz2"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE=""
 
 DEPEND="x11-libs/qt-core:4"
@@ -23,7 +23,13 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.88-objc++.patch
+)
+
 src_prepare() {
+	base_src_prepare
+
 	if [[ ${ELIBC} = uclibc ]]; then
 		append-flags -pthread
 	fi
diff --git a/kde-base/automoc/files/automoc-0.9.88-objc++.patch b/kde-base/automoc/files/automoc-0.9.88-objc++.patch
new file mode 100644
index 000000000000..1f4dacdc06eb
--- /dev/null
+++ b/kde-base/automoc/files/automoc-0.9.88-objc++.patch
@@ -0,0 +1,48 @@
+Please refer to
+  http://websvn.kde.org/?view=revision&revision=934696
+
+Adds support for objc++ in automoc, so that running moc on .mm-files will work.
+
+--- trunk/kdesupport/automoc/Automoc4Config.cmake	2009/03/03 15:40:57	934695
++++ trunk/kdesupport/automoc/Automoc4Config.cmake	2009/03/03 15:42:18	934696
+@@ -105,9 +105,9 @@
+       if(NOT  _generated  AND NOT  _skip)
+          get_filename_component(_suffix "${_current_FILE}" EXT)
+          # skip every source file that's not C++
+-         if(_suffix STREQUAL ".cpp" OR _suffix STREQUAL ".cc" OR _suffix STREQUAL ".cxx" OR _suffix STREQUAL ".C")
++         if(_suffix STREQUAL ".cpp" OR _suffix STREQUAL ".cc" OR _suffix STREQUAL ".cxx" OR _suffix STREQUAL ".C" OR _suffix STREQUAL ".mm")
+              list(APPEND _moc_files ${_abs_current_FILE})
+-         endif(_suffix STREQUAL ".cpp" OR _suffix STREQUAL ".cc" OR _suffix STREQUAL ".cxx" OR _suffix STREQUAL ".C")
++         endif(_suffix STREQUAL ".cpp" OR _suffix STREQUAL ".cc" OR _suffix STREQUAL ".cxx" OR _suffix STREQUAL ".C" OR _suffix STREQUAL ".mm")
+       endif(NOT  _generated  AND NOT  _skip)
+    endforeach (_current_FILE)
+ 
+@@ -156,7 +156,7 @@
+       if(NOT  _generated  AND NOT  _skip)
+          get_filename_component(_suffix "${_current_FILE}" EXT)
+          # skip every source file that's not C++
+-         if(_suffix STREQUAL ".cpp" OR _suffix STREQUAL ".cc" OR _suffix STREQUAL ".cxx" OR _suffix STREQUAL ".C")
++         if(_suffix STREQUAL ".cpp" OR _suffix STREQUAL ".cc" OR _suffix STREQUAL ".cxx" OR _suffix STREQUAL ".C" OR _suffix STREQUAL ".mm")
+              get_filename_component(_basename "${_current_FILE}" NAME_WE)
+              get_filename_component(_abs_path "${_abs_current_FILE}" PATH)
+              set(_header "${_abs_path}/${_basename}.h")
+@@ -168,7 +168,7 @@
+                 list(APPEND _moc_headers ${_pheader})
+              endif(EXISTS "${_pheader}")
+              list(APPEND _moc_files ${_abs_current_FILE})
+-         endif(_suffix STREQUAL ".cpp" OR _suffix STREQUAL ".cc" OR _suffix STREQUAL ".cxx" OR _suffix STREQUAL ".C")
++         endif(_suffix STREQUAL ".cpp" OR _suffix STREQUAL ".cc" OR _suffix STREQUAL ".cxx" OR _suffix STREQUAL ".C" OR _suffix STREQUAL ".mm")
+       endif(NOT  _generated  AND NOT  _skip)
+    endforeach (_current_FILE)
+ 
+--- trunk/kdesupport/automoc/kde4automoc.cpp	2009/03/03 15:40:57	934695
++++ trunk/kdesupport/automoc/kde4automoc.cpp	2009/03/03 15:42:18	934696
+@@ -326,7 +326,7 @@
+     foreach (const QString &absFilename, sourceFiles) {
+         //qDebug() << absFilename;
+         const QFileInfo sourceFileInfo(absFilename);
+-        if (absFilename.endsWith(".cpp") || absFilename.endsWith(".cc") ||
++        if (absFilename.endsWith(".cpp") || absFilename.endsWith(".cc") || absFilename.endsWith(".mm") ||
+                 absFilename.endsWith(".cxx") || absFilename.endsWith(".C")) {
+             //qDebug() << "check .cpp file";
+             QFile sourceFile(absFilename);