Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde-sunset:master commit in: dev-util/automoc/files/, dev-util/automoc/
Date: Thu, 31 May 2018 18:30:33
Message-Id: 1527791394.5598aaecc3cf3dd1b73f3b2257ab5b69f85add51.asturm@gentoo
1 commit: 5598aaecc3cf3dd1b73f3b2257ab5b69f85add51
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Thu May 31 17:32:30 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Thu May 31 18:29:54 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=5598aaec
7
8 dev-util/automoc: Import from Gentoo ebuild repo
9
10 Package-Manager: Portage-2.3.40, Repoman-2.3.9
11
12 dev-util/automoc/automoc-0.9.88-r1.ebuild | 34 +++++++++++++++
13 dev-util/automoc/files/automoc-0.9.88-objc++.patch | 48 ++++++++++++++++++++++
14 dev-util/automoc/metadata.xml | 5 +++
15 3 files changed, 87 insertions(+)
16
17 diff --git a/dev-util/automoc/automoc-0.9.88-r1.ebuild b/dev-util/automoc/automoc-0.9.88-r1.ebuild
18 new file mode 100644
19 index 0000000..161306a
20 --- /dev/null
21 +++ b/dev-util/automoc/automoc-0.9.88-r1.ebuild
22 @@ -0,0 +1,34 @@
23 +# Copyright 1999-2018 Gentoo Foundation
24 +# Distributed under the terms of the GNU General Public License v2
25 +
26 +EAPI=5
27 +
28 +MY_PN="automoc4"
29 +MY_P="${MY_PN}-${PV}"
30 +inherit cmake-utils flag-o-matic
31 +
32 +DESCRIPTION="KDE Meta Object Compiler"
33 +HOMEPAGE="https://www.kde.org"
34 +SRC_URI="mirror://kde/stable/${MY_PN}/${PV}/${MY_P}.tar.bz2"
35 +
36 +LICENSE="BSD-2"
37 +SLOT="0"
38 +KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
39 +IUSE=""
40 +
41 +DEPEND="
42 + dev-qt/qtcore:4
43 +"
44 +RDEPEND="${DEPEND}"
45 +
46 +S="${WORKDIR}/${MY_P}"
47 +
48 +PATCHES=( "${FILESDIR}/${PN}-0.9.88-objc++.patch" )
49 +
50 +src_prepare() {
51 + cmake-utils_src_prepare
52 +
53 + if [[ ${ELIBC} = uclibc ]]; then
54 + append-flags -pthread
55 + fi
56 +}
57
58 diff --git a/dev-util/automoc/files/automoc-0.9.88-objc++.patch b/dev-util/automoc/files/automoc-0.9.88-objc++.patch
59 new file mode 100644
60 index 0000000..1f4dacd
61 --- /dev/null
62 +++ b/dev-util/automoc/files/automoc-0.9.88-objc++.patch
63 @@ -0,0 +1,48 @@
64 +Please refer to
65 + http://websvn.kde.org/?view=revision&revision=934696
66 +
67 +Adds support for objc++ in automoc, so that running moc on .mm-files will work.
68 +
69 +--- trunk/kdesupport/automoc/Automoc4Config.cmake 2009/03/03 15:40:57 934695
70 ++++ trunk/kdesupport/automoc/Automoc4Config.cmake 2009/03/03 15:42:18 934696
71 +@@ -105,9 +105,9 @@
72 + if(NOT _generated AND NOT _skip)
73 + get_filename_component(_suffix "${_current_FILE}" EXT)
74 + # skip every source file that's not C++
75 +- if(_suffix STREQUAL ".cpp" OR _suffix STREQUAL ".cc" OR _suffix STREQUAL ".cxx" OR _suffix STREQUAL ".C")
76 ++ if(_suffix STREQUAL ".cpp" OR _suffix STREQUAL ".cc" OR _suffix STREQUAL ".cxx" OR _suffix STREQUAL ".C" OR _suffix STREQUAL ".mm")
77 + list(APPEND _moc_files ${_abs_current_FILE})
78 +- endif(_suffix STREQUAL ".cpp" OR _suffix STREQUAL ".cc" OR _suffix STREQUAL ".cxx" OR _suffix STREQUAL ".C")
79 ++ endif(_suffix STREQUAL ".cpp" OR _suffix STREQUAL ".cc" OR _suffix STREQUAL ".cxx" OR _suffix STREQUAL ".C" OR _suffix STREQUAL ".mm")
80 + endif(NOT _generated AND NOT _skip)
81 + endforeach (_current_FILE)
82 +
83 +@@ -156,7 +156,7 @@
84 + if(NOT _generated AND NOT _skip)
85 + get_filename_component(_suffix "${_current_FILE}" EXT)
86 + # skip every source file that's not C++
87 +- if(_suffix STREQUAL ".cpp" OR _suffix STREQUAL ".cc" OR _suffix STREQUAL ".cxx" OR _suffix STREQUAL ".C")
88 ++ if(_suffix STREQUAL ".cpp" OR _suffix STREQUAL ".cc" OR _suffix STREQUAL ".cxx" OR _suffix STREQUAL ".C" OR _suffix STREQUAL ".mm")
89 + get_filename_component(_basename "${_current_FILE}" NAME_WE)
90 + get_filename_component(_abs_path "${_abs_current_FILE}" PATH)
91 + set(_header "${_abs_path}/${_basename}.h")
92 +@@ -168,7 +168,7 @@
93 + list(APPEND _moc_headers ${_pheader})
94 + endif(EXISTS "${_pheader}")
95 + list(APPEND _moc_files ${_abs_current_FILE})
96 +- endif(_suffix STREQUAL ".cpp" OR _suffix STREQUAL ".cc" OR _suffix STREQUAL ".cxx" OR _suffix STREQUAL ".C")
97 ++ endif(_suffix STREQUAL ".cpp" OR _suffix STREQUAL ".cc" OR _suffix STREQUAL ".cxx" OR _suffix STREQUAL ".C" OR _suffix STREQUAL ".mm")
98 + endif(NOT _generated AND NOT _skip)
99 + endforeach (_current_FILE)
100 +
101 +--- trunk/kdesupport/automoc/kde4automoc.cpp 2009/03/03 15:40:57 934695
102 ++++ trunk/kdesupport/automoc/kde4automoc.cpp 2009/03/03 15:42:18 934696
103 +@@ -326,7 +326,7 @@
104 + foreach (const QString &absFilename, sourceFiles) {
105 + //qDebug() << absFilename;
106 + const QFileInfo sourceFileInfo(absFilename);
107 +- if (absFilename.endsWith(".cpp") || absFilename.endsWith(".cc") ||
108 ++ if (absFilename.endsWith(".cpp") || absFilename.endsWith(".cc") || absFilename.endsWith(".mm") ||
109 + absFilename.endsWith(".cxx") || absFilename.endsWith(".C")) {
110 + //qDebug() << "check .cpp file";
111 + QFile sourceFile(absFilename);
112
113 diff --git a/dev-util/automoc/metadata.xml b/dev-util/automoc/metadata.xml
114 new file mode 100644
115 index 0000000..6f49eba
116 --- /dev/null
117 +++ b/dev-util/automoc/metadata.xml
118 @@ -0,0 +1,5 @@
119 +<?xml version="1.0" encoding="UTF-8"?>
120 +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
121 +<pkgmetadata>
122 +<!-- maintainer-needed -->
123 +</pkgmetadata>