diff options
| author | Andreas Sturmlechner <andreas.sturmlechner@gmail.com> | 2015-01-04 13:06:45 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <andreas.sturmlechner@gmail.com> | 2015-01-08 23:44:09 +0100 |
| commit | 056cf87fda9bd579d4b20424ae6c95c6502c525f (patch) | |
| tree | 8373570f2d802dc5ae9efe4c58fe37d777a44ab2 | |
| parent | aadf0b88a0c3d62b19fa2361218ca6d491c3dfbb (diff) | |
| download | kde-056cf87fda9bd579d4b20424ae6c95c6502c525f.tar.gz kde-056cf87fda9bd579d4b20424ae6c95c6502c525f.tar.bz2 kde-056cf87fda9bd579d4b20424ae6c95c6502c525f.zip | |
libkomparediff2-5.9999:5 -> libkomparediff2-9999:5
| -rw-r--r-- | kde-apps/libkomparediff2/libkomparediff2-4.9999.ebuild | 16 | ||||
| -rw-r--r-- | kde-apps/libkomparediff2/libkomparediff2-5.9999.ebuild | 29 | ||||
| -rw-r--r-- | kde-apps/libkomparediff2/libkomparediff2-9999.ebuild | 18 | ||||
| -rw-r--r-- | sets/kde-applications-live | 2 |
4 files changed, 33 insertions, 32 deletions
diff --git a/kde-apps/libkomparediff2/libkomparediff2-4.9999.ebuild b/kde-apps/libkomparediff2/libkomparediff2-4.9999.ebuild new file mode 100644 index 00000000000..5620b0ff532 --- /dev/null +++ b/kde-apps/libkomparediff2/libkomparediff2-4.9999.ebuild @@ -0,0 +1,16 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +EGIT_BRANCH="Applications/14.12" +inherit kde4-base + +DESCRIPTION="KDE library to compare files and strings" +KEYWORDS="" +IUSE="debug test" + +RDEPEND="${DEPEND} + !<=kde-base/kompare-4.11.50 +" diff --git a/kde-apps/libkomparediff2/libkomparediff2-5.9999.ebuild b/kde-apps/libkomparediff2/libkomparediff2-5.9999.ebuild deleted file mode 100644 index 92eef293c7f..00000000000 --- a/kde-apps/libkomparediff2/libkomparediff2-5.9999.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -KDE_TEST="true" -EGIT_BRANCH="frameworks" -inherit kde5 - -DESCRIPTION="KDE library to compare files and strings" -KEYWORDS="" -IUSE="" - -DEPEND=" - $(add_frameworks_dep kcodecs) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kio) - $(add_frameworks_dep kxmlgui) - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 -" -RDEPEND="${DEPEND} - !<=kde-base/kompare-4.11.50 - !kde-base/libkomparediff2:4 -" diff --git a/kde-apps/libkomparediff2/libkomparediff2-9999.ebuild b/kde-apps/libkomparediff2/libkomparediff2-9999.ebuild index 9b42a3201ef..92eef293c7f 100644 --- a/kde-apps/libkomparediff2/libkomparediff2-9999.ebuild +++ b/kde-apps/libkomparediff2/libkomparediff2-9999.ebuild @@ -4,12 +4,26 @@ EAPI=5 -inherit kde4-base +KDE_TEST="true" +EGIT_BRANCH="frameworks" +inherit kde5 DESCRIPTION="KDE library to compare files and strings" KEYWORDS="" -IUSE="debug test" +IUSE="" +DEPEND=" + $(add_frameworks_dep kcodecs) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kio) + $(add_frameworks_dep kxmlgui) + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 +" RDEPEND="${DEPEND} !<=kde-base/kompare-4.11.50 + !kde-base/libkomparediff2:4 " diff --git a/sets/kde-applications-live b/sets/kde-applications-live index 986edc26495..4cecc54ac51 100644 --- a/sets/kde-applications-live +++ b/sets/kde-applications-live @@ -10,7 +10,7 @@ ~kde-apps/ksnapshot-5.9999 ~kde-apps/kwrite-9999 ~kde-apps/libkcddb-5.9999 -~kde-apps/libkomparediff2-5.9999 +~kde-apps/libkomparediff2-9999 ~kde-apps/libkonq-5.9999 ~kde-apps/okteta-9999 ~kde-apps/okular-5.9999 |