diff options
23 files changed, 173 insertions, 69 deletions
diff --git a/Documentation/package.keywords/.kde-4.10.49.9999/kdesdk-4.10 b/Documentation/package.keywords/.kde-4.10.49.9999/kdesdk-4.10 index 54de9e7fc4f..919cb51108c 100644 --- a/Documentation/package.keywords/.kde-4.10.49.9999/kdesdk-4.10 +++ b/Documentation/package.keywords/.kde-4.10.49.9999/kdesdk-4.10 @@ -13,4 +13,5 @@ ~kde-base/kuiviewer-4.10.49.9999 ** ~kde-base/lokalize-4.10.49.9999 ** ~kde-base/okteta-4.10.49.9999 ** +~kde-base/poxml-4.10.49.9999 ** ~kde-base/umbrello-4.10.49.9999 ** diff --git a/Documentation/package.keywords/.kde-live/kdesdk-live b/Documentation/package.keywords/.kde-live/kdesdk-live index 8cb28bf9e25..f7d88c340cc 100644 --- a/Documentation/package.keywords/.kde-live/kdesdk-live +++ b/Documentation/package.keywords/.kde-live/kdesdk-live @@ -4,13 +4,12 @@ ~kde-base/kate-9999 ** ~kde-base/kcachegrind-9999 ** ~kde-base/kde-dev-scripts-9999 ** +~kde-base/kde-dev-utils-9999 ** ~kde-base/kdesdk-kioslaves-9999 ** ~kde-base/kdesdk-meta-9999 ** -~kde-base/kdesdk-misc-9999 ** ~kde-base/kdesdk-strigi-analyzers-9999 ** ~kde-base/kompare-9999 ** -~kde-base/kstartperf-9999 ** -~kde-base/kuiviewer-9999 ** ~kde-base/lokalize-9999 ** ~kde-base/okteta-9999 ** +~kde-base/poxml-9999 ** ~kde-base/umbrello-9999 ** diff --git a/Documentation/package.keywords/kde-4.10.49.9999.keywords b/Documentation/package.keywords/kde-4.10.49.9999.keywords index 2942c3acd46..4dbcd1fd2b7 100644 --- a/Documentation/package.keywords/kde-4.10.49.9999.keywords +++ b/Documentation/package.keywords/kde-4.10.49.9999.keywords @@ -268,6 +268,7 @@ ~kde-base/kuiviewer-4.10.49.9999 ** ~kde-base/lokalize-4.10.49.9999 ** ~kde-base/okteta-4.10.49.9999 ** +~kde-base/poxml-4.10.49.9999 ** ~kde-base/umbrello-4.10.49.9999 ** ~kde-base/amor-4.10.49.9999 ** ~kde-base/kdetoys-meta-4.10.49.9999 ** diff --git a/Documentation/package.keywords/kde-4.10.keywords b/Documentation/package.keywords/kde-4.10.keywords index b5a996670ff..aa0212d2aab 100644 --- a/Documentation/package.keywords/kde-4.10.keywords +++ b/Documentation/package.keywords/kde-4.10.keywords @@ -268,6 +268,7 @@ <kde-base/kuiviewer-4.10.50 <kde-base/lokalize-4.10.50 <kde-base/okteta-4.10.50 +<kde-base/poxml-4.10.50 <kde-base/umbrello-4.10.50 <kde-base/amor-4.10.50 <kde-base/kdetoys-meta-4.10.50 diff --git a/Documentation/package.keywords/kde-live.keywords b/Documentation/package.keywords/kde-live.keywords index baa7c3da251..8e38dc6baf0 100644 --- a/Documentation/package.keywords/kde-live.keywords +++ b/Documentation/package.keywords/kde-live.keywords @@ -281,15 +281,14 @@ ~kde-base/kate-9999 ** ~kde-base/kcachegrind-9999 ** ~kde-base/kde-dev-scripts-9999 ** +~kde-base/kde-dev-utils-9999 ** ~kde-base/kdesdk-kioslaves-9999 ** ~kde-base/kdesdk-meta-9999 ** -~kde-base/kdesdk-misc-9999 ** ~kde-base/kdesdk-strigi-analyzers-9999 ** ~kde-base/kompare-9999 ** -~kde-base/kstartperf-9999 ** -~kde-base/kuiviewer-9999 ** ~kde-base/lokalize-9999 ** ~kde-base/okteta-9999 ** +~kde-base/poxml-9999 ** ~kde-base/umbrello-9999 ** ~kde-base/amor-9999 ** ~kde-base/kdetoys-meta-9999 ** diff --git a/Documentation/package.mask/kde-4.10 b/Documentation/package.mask/kde-4.10 index 1823fc419d5..8479e058442 100644 --- a/Documentation/package.mask/kde-4.10 +++ b/Documentation/package.mask/kde-4.10 @@ -268,6 +268,7 @@ <kde-base/kuiviewer-4.10.50 <kde-base/lokalize-4.10.50 <kde-base/okteta-4.10.50 +<kde-base/poxml-4.10.50 <kde-base/umbrello-4.10.50 <kde-base/amor-4.10.50 <kde-base/kdetoys-meta-4.10.50 diff --git a/Documentation/package.mask/kde-live b/Documentation/package.mask/kde-live index e000ac03f7f..73bd6afc65b 100644 --- a/Documentation/package.mask/kde-live +++ b/Documentation/package.mask/kde-live @@ -281,15 +281,14 @@ ~kde-base/kate-9999 ** ~kde-base/kcachegrind-9999 ** ~kde-base/kde-dev-scripts-9999 ** +~kde-base/kde-dev-utils-9999 ** ~kde-base/kdesdk-kioslaves-9999 ** ~kde-base/kdesdk-meta-9999 ** -~kde-base/kdesdk-misc-9999 ** ~kde-base/kdesdk-strigi-analyzers-9999 ** ~kde-base/kompare-9999 ** -~kde-base/kstartperf-9999 ** -~kde-base/kuiviewer-9999 ** ~kde-base/lokalize-9999 ** ~kde-base/okteta-9999 ** +~kde-base/poxml-9999 ** ~kde-base/umbrello-9999 ** ~kde-base/amor-9999 ** ~kde-base/kdetoys-meta-9999 ** diff --git a/Documentation/package.unmask/kde-4.10 b/Documentation/package.unmask/kde-4.10 index 1823fc419d5..8479e058442 100644 --- a/Documentation/package.unmask/kde-4.10 +++ b/Documentation/package.unmask/kde-4.10 @@ -268,6 +268,7 @@ <kde-base/kuiviewer-4.10.50 <kde-base/lokalize-4.10.50 <kde-base/okteta-4.10.50 +<kde-base/poxml-4.10.50 <kde-base/umbrello-4.10.50 <kde-base/amor-4.10.50 <kde-base/kdetoys-meta-4.10.50 diff --git a/Documentation/package.unmask/kde-live b/Documentation/package.unmask/kde-live index 0d4ba31f1a9..376d97be3b0 100644 --- a/Documentation/package.unmask/kde-live +++ b/Documentation/package.unmask/kde-live @@ -281,15 +281,14 @@ ~kde-base/kate-9999 ~kde-base/kcachegrind-9999 ~kde-base/kde-dev-scripts-9999 +~kde-base/kde-dev-utils-9999 ~kde-base/kdesdk-kioslaves-9999 ~kde-base/kdesdk-meta-9999 -~kde-base/kdesdk-misc-9999 ~kde-base/kdesdk-strigi-analyzers-9999 ~kde-base/kompare-9999 -~kde-base/kstartperf-9999 -~kde-base/kuiviewer-9999 ~kde-base/lokalize-9999 ~kde-base/okteta-9999 +~kde-base/poxml-9999 ~kde-base/umbrello-9999 ~kde-base/amor-9999 ~kde-base/kdetoys-meta-9999 diff --git a/kde-base/kstartperf/kstartperf-9999.ebuild b/kde-base/kde-dev-utils/kde-dev-utils-9999.ebuild index 09f63e86780..cb20d10f07d 100644 --- a/kde-base/kstartperf/kstartperf-9999.ebuild +++ b/kde-base/kde-dev-utils/kde-dev-utils-9999.ebuild @@ -4,10 +4,12 @@ EAPI=5 -KMNAME="kdesdk" -KDE_SCM="svn" -inherit kde4-meta +inherit kde4-base -DESCRIPTION="Measures starting performance of applications" +DESCRIPTION="KDE Development Utilities" KEYWORDS="" IUSE="debug" + +add_blocker kdesdk-misc +add_blocker kstartperf +add_blocker kuiviewer diff --git a/kde-base/kde-dev-utils/metadata.xml b/kde-base/kde-dev-utils/metadata.xml new file mode 100644 index 00000000000..8d1e86a9cef --- /dev/null +++ b/kde-base/kde-dev-utils/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>kde</herd> +</pkgmetadata> diff --git a/kde-base/kdesdk-meta/kdesdk-meta-4.10.0-r1.ebuild b/kde-base/kdesdk-meta/kdesdk-meta-4.10.0-r1.ebuild new file mode 100644 index 00000000000..4f4792beac4 --- /dev/null +++ b/kde-base/kdesdk-meta/kdesdk-meta-4.10.0-r1.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 +inherit kde4-meta-pkg + +DESCRIPTION="KDE SDK - merge this to pull in all kdesdk-derived packages" +KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux" +IUSE="cvs" + +RDEPEND=" + cvs? ( $(add_kdebase_dep cervisia) ) + $(add_kdebase_dep dolphin-plugins) + $(add_kdebase_dep kapptemplate) + $(add_kdebase_dep kate) + $(add_kdebase_dep kcachegrind) + $(add_kdebase_dep kdesdk-kioslaves) + $(add_kdebase_dep kdesdk-misc) + $(add_kdebase_dep kdesdk-scripts) + $(add_kdebase_dep kdesdk-strigi-analyzer) + $(add_kdebase_dep kompare) + $(add_kdebase_dep kstartperf) + $(add_kdebase_dep kuiviewer) + $(add_kdebase_dep lokalize) + $(add_kdebase_dep okteta) + $(add_kdebase_dep poxml) + $(add_kdebase_dep umbrello) +" diff --git a/kde-base/kdesdk-meta/kdesdk-meta-4.10.49.9999.ebuild b/kde-base/kdesdk-meta/kdesdk-meta-4.10.49.9999.ebuild index eec3272c1cd..364b52967a2 100644 --- a/kde-base/kdesdk-meta/kdesdk-meta-4.10.49.9999.ebuild +++ b/kde-base/kdesdk-meta/kdesdk-meta-4.10.49.9999.ebuild @@ -24,5 +24,6 @@ RDEPEND=" $(add_kdebase_dep kuiviewer) $(add_kdebase_dep lokalize) $(add_kdebase_dep okteta) + $(add_kdebase_dep poxml) $(add_kdebase_dep umbrello) " diff --git a/kde-base/kdesdk-meta/kdesdk-meta-9999.ebuild b/kde-base/kdesdk-meta/kdesdk-meta-9999.ebuild index 0e3ba386f62..e014c77cc7d 100644 --- a/kde-base/kdesdk-meta/kdesdk-meta-9999.ebuild +++ b/kde-base/kdesdk-meta/kdesdk-meta-9999.ebuild @@ -16,13 +16,12 @@ RDEPEND=" $(add_kdebase_dep kate) $(add_kdebase_dep kcachegrind) $(add_kdebase_dep kde-dev-scripts) + $(add_kdebase_dep kde-dev-utils) $(add_kdebase_dep kdesdk-kioslaves) - $(add_kdebase_dep kdesdk-misc) $(add_kdebase_dep kdesdk-strigi-analyzers) $(add_kdebase_dep kompare) - $(add_kdebase_dep kstartperf) - $(add_kdebase_dep kuiviewer) $(add_kdebase_dep lokalize) $(add_kdebase_dep okteta) + $(add_kdebase_dep poxml) $(add_kdebase_dep umbrello) " diff --git a/kde-base/kdesdk-misc/kdesdk-misc-4.10.0-r1.ebuild b/kde-base/kdesdk-misc/kdesdk-misc-4.10.0-r1.ebuild new file mode 100644 index 00000000000..ef887ee378d --- /dev/null +++ b/kde-base/kdesdk-misc/kdesdk-misc-4.10.0-r1.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +if [[ ${PV} == *9999 ]]; then + KMNAME="kde-dev-util" +else + KMNAME="kdesdk" +fi +KMNOMODULE="true" +inherit kde4-meta + +DESCRIPTION="KDE miscellaneous SDK tools" +KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux" +IUSE="debug" + +KMEXTRA=" + doc/kmtrace/ + kmtrace/ + kpartloader/ + kprofilemethod/ +" diff --git a/kde-base/kdesdk-misc/kdesdk-misc-4.10.49.9999.ebuild b/kde-base/kdesdk-misc/kdesdk-misc-4.10.49.9999.ebuild index 312470767d9..7fc8f25a1d5 100644 --- a/kde-base/kdesdk-misc/kdesdk-misc-4.10.49.9999.ebuild +++ b/kde-base/kdesdk-misc/kdesdk-misc-4.10.49.9999.ebuild @@ -4,36 +4,20 @@ EAPI=5 -KMNAME="kdesdk" +if [[ ${PV} == *9999 ]]; then + KMNAME="kde-dev-util" +else + KMNAME="kdesdk" +fi KMNOMODULE="true" -KDE_SCM="svn" inherit kde4-meta DESCRIPTION="KDE miscellaneous SDK tools" KEYWORDS="" -IUSE="debug extras" - -DEPEND=" - extras? ( >=dev-java/antlr-2.7.7:0[cxx,java,script] ) -" -RDEPEND="${DEPEND}" +IUSE="debug" KMEXTRA=" - doc/kmtrace/ - doc/poxml/ kmtrace/ kpartloader/ kprofilemethod/ - poxml/ " -# java deps on anltr cant be properly explained to cmake deps -# needs to be run in one thread -MAKEOPTS+=" -j1" - -src_configure() { - mycmakeargs=( - $(cmake-utils_use_with extras Antlr2) - ) - - kde4-meta_src_configure -} diff --git a/kde-base/kuiviewer/kuiviewer-9999.ebuild b/kde-base/kuiviewer/kuiviewer-9999.ebuild deleted file mode 100644 index acbf76013e5..00000000000 --- a/kde-base/kuiviewer/kuiviewer-9999.ebuild +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -KMNAME="kdesdk" -KDE_SCM="svn" -inherit kde4-meta - -DESCRIPTION="KDE utility that displays and tests UI files generated by Qt Designer." -KEYWORDS="" -IUSE="debug" diff --git a/kde-base/poxml/metadata.xml b/kde-base/poxml/metadata.xml new file mode 100644 index 00000000000..8d1e86a9cef --- /dev/null +++ b/kde-base/poxml/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>kde</herd> +</pkgmetadata> diff --git a/kde-base/poxml/poxml-4.10.0.ebuild b/kde-base/poxml/poxml-4.10.0.ebuild new file mode 100644 index 00000000000..bf4fd275a91 --- /dev/null +++ b/kde-base/poxml/poxml-4.10.0.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +if [[ ${PV} == *9999 ]]; then + eclass="kde4-base" +else + eclass="kde4-meta" + KMNAME="kdesdk" + KMEXTRA="doc/poxml/" +fi +inherit ${eclass} + +DESCRIPTION="KDE utility to translate DocBook XML files using gettext po files" +KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux" +IUSE="debug extras" + +DEPEND=" + extras? ( >=dev-java/antlr-2.7.7:0[cxx,java,script] ) +" +RDEPEND="${DEPEND}" + +add_blocker kdesdk-misc '<4.10.0-r1' + +# java deps on anltr cant be properly explained to cmake deps +# needs to be run in one thread +MAKEOPTS+=" -j1" + +src_configure() { + mycmakeargs=( + $(cmake-utils_use_with extras Antlr2) + ) + + ${eclass}_src_configure +} diff --git a/kde-base/poxml/poxml-4.10.49.9999.ebuild b/kde-base/poxml/poxml-4.10.49.9999.ebuild new file mode 100644 index 00000000000..d67b90ba0a3 --- /dev/null +++ b/kde-base/poxml/poxml-4.10.49.9999.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +if [[ ${PV} == *9999 ]]; then + eclass="kde4-base" +else + eclass="kde4-meta" + KMNAME="kdesdk" + KMEXTRA="doc/poxml/" +fi +inherit ${eclass} + +DESCRIPTION="KDE utility to translate DocBook XML files using gettext po files" +KEYWORDS="" +IUSE="debug extras" + +DEPEND=" + extras? ( >=dev-java/antlr-2.7.7:0[cxx,java,script] ) +" +RDEPEND="${DEPEND}" + +add_blocker kdesdk-misc '<4.10.0-r1' + +# java deps on anltr cant be properly explained to cmake deps +# needs to be run in one thread +MAKEOPTS+=" -j1" + +src_configure() { + mycmakeargs=( + $(cmake-utils_use_with extras Antlr2) + ) + + ${eclass}_src_configure +} diff --git a/kde-base/kdesdk-misc/kdesdk-misc-9999.ebuild b/kde-base/poxml/poxml-9999.ebuild index 338ebbea357..4131086d4ef 100644 --- a/kde-base/kdesdk-misc/kdesdk-misc-9999.ebuild +++ b/kde-base/poxml/poxml-9999.ebuild @@ -4,12 +4,9 @@ EAPI=5 -KMNAME="kdesdk" -KMNOMODULE="true" -KDE_SCM="svn" -inherit kde4-meta +inherit kde4-base -DESCRIPTION="KDE miscellaneous SDK tools" +DESCRIPTION="KDE utility to translate DocBook XML files using gettext po files" KEYWORDS="" IUSE="debug extras" @@ -18,12 +15,8 @@ DEPEND=" " RDEPEND="${DEPEND}" -KMEXTRA=" - kmtrace/ - kpartloader/ - kprofilemethod/ - poxml/ -" +add_blocker kdesdk-misc '<4.10.0-r1' + # java deps on anltr cant be properly explained to cmake deps # needs to be run in one thread MAKEOPTS+=" -j1" @@ -33,5 +26,5 @@ src_configure() { $(cmake-utils_use_with extras Antlr2) ) - kde4-meta_src_configure + kde4-base_src_configure } diff --git a/sets/kdesdk-4.10 b/sets/kdesdk-4.10 index a70b72a6bb0..b59168a20de 100644 --- a/sets/kdesdk-4.10 +++ b/sets/kdesdk-4.10 @@ -13,4 +13,5 @@ <kde-base/kuiviewer-4.10.50 <kde-base/lokalize-4.10.50 <kde-base/okteta-4.10.50 +<kde-base/poxml-4.10.50 <kde-base/umbrello-4.10.50 diff --git a/sets/kdesdk-live b/sets/kdesdk-live index f13a817f36c..d986d16074d 100644 --- a/sets/kdesdk-live +++ b/sets/kdesdk-live @@ -4,13 +4,12 @@ ~kde-base/kate-9999 ~kde-base/kcachegrind-9999 ~kde-base/kde-dev-scripts-9999 +~kde-base/kde-dev-utils-9999 ~kde-base/kdesdk-kioslaves-9999 ~kde-base/kdesdk-meta-9999 -~kde-base/kdesdk-misc-9999 ~kde-base/kdesdk-strigi-analyzers-9999 ~kde-base/kompare-9999 -~kde-base/kstartperf-9999 -~kde-base/kuiviewer-9999 ~kde-base/lokalize-9999 ~kde-base/okteta-9999 +~kde-base/poxml-9999 ~kde-base/umbrello-9999 |