[gentoo-commits] proj/kde:master commit in: x11-libs/libkscreen2/, x11-libs/libkscreen/

[Michael Palimaka]

commit:     631995898f390dbfef7f578d7a600afbdb0da01f
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  1 12:22:24 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Jul  1 12:22:30 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=63199589

[x11-libs/libkscreen2] Move back to x11-libs/libkscreen due to another upstream 
change.

Now only the tarball is renamed.

---
 .../libkscreen2-9999.ebuild => libkscreen/libkscreen-1.72.ebuild}  | 3 +--
 .../libkscreen2-1.72.ebuild => libkscreen/libkscreen-9999.ebuild}  | 7 ++-----
 x11-libs/libkscreen2/metadata.xml                                  | 5 -----
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/x11-libs/libkscreen2/libkscreen2-9999.ebuild 
b/x11-libs/libkscreen/libkscreen-1.72.ebuild
similarity index 87%
rename from x11-libs/libkscreen2/libkscreen2-9999.ebuild
rename to x11-libs/libkscreen/libkscreen-1.72.ebuild
index 212b325..38b1184 100644
--- a/x11-libs/libkscreen2/libkscreen2-9999.ebuild
+++ b/x11-libs/libkscreen/libkscreen-1.72.ebuild
@@ -7,10 +7,9 @@ EAPI=5
 VIRTUALX_REQUIRED="test"
 if [[ $PV = *9999* ]]; then
        EGIT_BRANCH="frameworks"
-       KMNAME="libkscreen"
        KEYWORDS=""
 else
-       SRC_URI="mirror://kde/unstable/plasma/4.96.0/src/${P}.tar.xz"
+       SRC_URI="mirror://kde/unstable/plasma/4.97.0/src/${PN}2-${PV}.tar.xz"
        KEYWORDS="~amd64 ~x86"
 fi
 

diff --git a/x11-libs/libkscreen2/libkscreen2-1.72.ebuild 
b/x11-libs/libkscreen/libkscreen-9999.ebuild
similarity index 81%
rename from x11-libs/libkscreen2/libkscreen2-1.72.ebuild
rename to x11-libs/libkscreen/libkscreen-9999.ebuild
index 42846ab..38b1184 100644
--- a/x11-libs/libkscreen2/libkscreen2-1.72.ebuild
+++ b/x11-libs/libkscreen/libkscreen-9999.ebuild
@@ -7,10 +7,9 @@ EAPI=5
 VIRTUALX_REQUIRED="test"
 if [[ $PV = *9999* ]]; then
        EGIT_BRANCH="frameworks"
-       KMNAME="libkscreen"
        KEYWORDS=""
 else
-       SRC_URI="mirror://kde/unstable/plasma/4.97.0/src/${P}.tar.xz"
+       SRC_URI="mirror://kde/unstable/plasma/4.97.0/src/${PN}2-${PV}.tar.xz"
        KEYWORDS="~amd64 ~x86"
 fi
 
@@ -31,6 +30,4 @@ DEPEND="
        x11-libs/libxcb
        x11-libs/libXrandr
 "
-RDEPEND="${DEPEND}
-       !x11-libs/libkscreen:5
-"
+RDEPEND="${DEPEND}"

diff --git a/x11-libs/libkscreen2/metadata.xml 
b/x11-libs/libkscreen2/metadata.xml
deleted file mode 100644
index a23f444..0000000
--- a/x11-libs/libkscreen2/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-       <herd>kde</herd>
-</pkgmetadata>