public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/kde:master commit in: x11-libs/libkscreen2/
@ 2014-05-16 16:33 Michael Palimaka
  0 siblings, 0 replies; 6+ messages in thread
From: Michael Palimaka @ 2014-05-16 16:33 UTC (permalink / raw
  To: gentoo-commits

commit:     bf11dfc6299be2125c70554b227ff3b00efa8eb4
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri May 16 16:33:31 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri May 16 16:33:31 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=bf11dfc6

[x11-libs/libkscreen2] Use correct ebuild name.

Package-Manager: portage-2.2.8-r1

---
 x11-libs/libkscreen2/{libkscreen-9999.ebuild => libkscreen2-9999.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/x11-libs/libkscreen2/libkscreen-9999.ebuild b/x11-libs/libkscreen2/libkscreen2-9999.ebuild
similarity index 100%
rename from x11-libs/libkscreen2/libkscreen-9999.ebuild
rename to x11-libs/libkscreen2/libkscreen2-9999.ebuild


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [gentoo-commits] proj/kde:master commit in: x11-libs/libkscreen2/
@ 2014-05-16 16:41 Michael Palimaka
  0 siblings, 0 replies; 6+ messages in thread
From: Michael Palimaka @ 2014-05-16 16:41 UTC (permalink / raw
  To: gentoo-commits

commit:     bcf1edfb9f3404b9d836038c7210631d3f510ce3
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri May 16 16:40:11 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri May 16 16:40:15 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=bcf1edfb

[x11-libs/libkscreen2] Use correct repo.

Although the release is renamed upstream, the repo remains
the same as it was originally.

Package-Manager: portage-2.2.8-r1

---
 x11-libs/libkscreen2/libkscreen2-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/x11-libs/libkscreen2/libkscreen2-9999.ebuild b/x11-libs/libkscreen2/libkscreen2-9999.ebuild
index e9bc2ac..a95e3dd 100644
--- a/x11-libs/libkscreen2/libkscreen2-9999.ebuild
+++ b/x11-libs/libkscreen2/libkscreen2-9999.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=5
 
+KMNAME="libkscreen"
 VIRTUALX_REQUIRED="test"
 EGIT_BRANCH="frameworks"
 inherit kde5


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] proj/kde:master commit in: x11-libs/libkscreen2/
@ 2014-05-18 17:09 Michael Palimaka
  0 siblings, 0 replies; 6+ messages in thread
From: Michael Palimaka @ 2014-05-18 17:09 UTC (permalink / raw
  To: gentoo-commits

commit:     3a4952559036b05a026340f08e800ea4fefac8cd
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun May 18 17:05:34 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun May 18 17:05:48 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=3a495255

[x11-libs/libkscreen2] KMNAME is only required for live ebuild wrt bug #510632.

This is because it is released as libkscreen2, but still uses
the original libkscreen repo.

Package-Manager: portage-2.2.8-r1

---
 x11-libs/libkscreen2/libkscreen2-1.71.ebuild | 2 +-
 x11-libs/libkscreen2/libkscreen2-9999.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-libs/libkscreen2/libkscreen2-1.71.ebuild b/x11-libs/libkscreen2/libkscreen2-1.71.ebuild
index 5191f10..212b325 100644
--- a/x11-libs/libkscreen2/libkscreen2-1.71.ebuild
+++ b/x11-libs/libkscreen2/libkscreen2-1.71.ebuild
@@ -4,10 +4,10 @@
 
 EAPI=5
 
-KMNAME="libkscreen"
 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"

diff --git a/x11-libs/libkscreen2/libkscreen2-9999.ebuild b/x11-libs/libkscreen2/libkscreen2-9999.ebuild
index 5191f10..212b325 100644
--- a/x11-libs/libkscreen2/libkscreen2-9999.ebuild
+++ b/x11-libs/libkscreen2/libkscreen2-9999.ebuild
@@ -4,10 +4,10 @@
 
 EAPI=5
 
-KMNAME="libkscreen"
 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"


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] proj/kde:master commit in: x11-libs/libkscreen2/
@ 2014-05-23 12:02 Johannes Huber
  0 siblings, 0 replies; 6+ messages in thread
From: Johannes Huber @ 2014-05-23 12:02 UTC (permalink / raw
  To: gentoo-commits

commit:     d2296ff9940b6a67986dcba4f343f9802693b500
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri May 23 12:01:13 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri May 23 12:01:13 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d2296ff9

[x11-libs/libkscreen2] Block x11-libs/libkscreen

Fixes file collisions.

Package-Manager: portage-2.2.10

---
 x11-libs/libkscreen2/libkscreen2-1.71.ebuild | 4 +++-
 x11-libs/libkscreen2/libkscreen2-9999.ebuild | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/x11-libs/libkscreen2/libkscreen2-1.71.ebuild b/x11-libs/libkscreen2/libkscreen2-1.71.ebuild
index 212b325..4b92a5d 100644
--- a/x11-libs/libkscreen2/libkscreen2-1.71.ebuild
+++ b/x11-libs/libkscreen2/libkscreen2-1.71.ebuild
@@ -31,4 +31,6 @@ DEPEND="
 	x11-libs/libxcb
 	x11-libs/libXrandr
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!x11-libs/libkscreen:5
+"

diff --git a/x11-libs/libkscreen2/libkscreen2-9999.ebuild b/x11-libs/libkscreen2/libkscreen2-9999.ebuild
index 212b325..4b92a5d 100644
--- a/x11-libs/libkscreen2/libkscreen2-9999.ebuild
+++ b/x11-libs/libkscreen2/libkscreen2-9999.ebuild
@@ -31,4 +31,6 @@ DEPEND="
 	x11-libs/libxcb
 	x11-libs/libXrandr
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!x11-libs/libkscreen:5
+"


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] proj/kde:master commit in: x11-libs/libkscreen2/
@ 2014-06-09 17:16 Michael Palimaka
  0 siblings, 0 replies; 6+ messages in thread
From: Michael Palimaka @ 2014-06-09 17:16 UTC (permalink / raw
  To: gentoo-commits

commit:     a6c4dedf81b50dab55fff2d8ddbfd98a457be343
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  9 17:15:23 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Jun  9 17:15:23 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=a6c4dedf

[x11-libs/libkscreen2] Remove blocker for collision solved upstream.

Upstream commit: 4ab583f20c0fa2159e6e0c5358969aa92b447065.

Package-Manager: portage-2.2.10

---
 x11-libs/libkscreen2/libkscreen2-9999.ebuild | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/x11-libs/libkscreen2/libkscreen2-9999.ebuild b/x11-libs/libkscreen2/libkscreen2-9999.ebuild
index 4b92a5d..212b325 100644
--- a/x11-libs/libkscreen2/libkscreen2-9999.ebuild
+++ b/x11-libs/libkscreen2/libkscreen2-9999.ebuild
@@ -31,6 +31,4 @@ DEPEND="
 	x11-libs/libxcb
 	x11-libs/libXrandr
 "
-RDEPEND="${DEPEND}
-	!x11-libs/libkscreen:5
-"
+RDEPEND="${DEPEND}"


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] proj/kde:master commit in: x11-libs/libkscreen2/
@ 2014-06-20 16:35 Michael Palimaka
  0 siblings, 0 replies; 6+ messages in thread
From: Michael Palimaka @ 2014-06-20 16:35 UTC (permalink / raw
  To: gentoo-commits

commit:     5a3b6bf38c34419a9249b2ab1beeb122b48f5c00
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 20 16:35:29 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Jun 20 16:35:29 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=5a3b6bf3

[x11-libs/libkscreen2] Version bump.

Package-Manager: portage-2.2.10

---
 .../libkscreen2/{libkscreen2-1.71.ebuild => libkscreen2-1.72.ebuild}    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/libkscreen2/libkscreen2-1.71.ebuild b/x11-libs/libkscreen2/libkscreen2-1.72.ebuild
similarity index 90%
rename from x11-libs/libkscreen2/libkscreen2-1.71.ebuild
rename to x11-libs/libkscreen2/libkscreen2-1.72.ebuild
index 4b92a5d..42846ab 100644
--- a/x11-libs/libkscreen2/libkscreen2-1.71.ebuild
+++ b/x11-libs/libkscreen2/libkscreen2-1.72.ebuild
@@ -10,7 +10,7 @@ if [[ $PV = *9999* ]]; then
 	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/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
 fi
 


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2014-06-20 16:35 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-09 17:16 [gentoo-commits] proj/kde:master commit in: x11-libs/libkscreen2/ Michael Palimaka
  -- strict thread matches above, loose matches on Subject: below --
2014-06-20 16:35 Michael Palimaka
2014-05-23 12:02 Johannes Huber
2014-05-18 17:09 Michael Palimaka
2014-05-16 16:41 Michael Palimaka
2014-05-16 16:33 Michael Palimaka

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox