Add blocker to <razorqt-base/razorqt-meta-0.5.0 to fix file collisions, bug #452560. Fix mirror usage.

Package-Manager: portage-2.2.0_alpha152/cvs/Linux x86_64

4 files changed, 15 insertions, 9 deletions

diff --git a/razorqt-base/razorqt-libs/ChangeLog b/razorqt-base/razorqt-libs/ChangeLog
index fb7385e5aac2..937890ca3230 100644
--- a/razorqt-base/razorqt-libs/ChangeLog
+++ b/razorqt-base/razorqt-libs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for razorqt-base/razorqt-libs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/razorqt-base/razorqt-libs/ChangeLog,v 1.3 2013/01/06 18:12:32 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/razorqt-base/razorqt-libs/ChangeLog,v 1.4 2013/01/17 05:54:38 yngwin Exp $
+
+  17 Jan 2013; Ben de Groot <yngwin@gentoo.org> razorqt-libs-0.5.0.ebuild,
+  razorqt-libs-0.5.1.ebuild:
+  Add blocker to <razorqt-base/razorqt-meta-0.5.0 to fix file collisions, bug
+  #452560. Fix mirror usage.
 
   06 Jan 2013; Agostino Sarubbo <ago@gentoo.org> razorqt-libs-0.5.1.ebuild:
   Add ~ppc, wrt bug #449322
diff --git a/razorqt-base/razorqt-libs/Manifest b/razorqt-base/razorqt-libs/Manifest
index 1726dca67f9a..4cdf23d05f74 100644
--- a/razorqt-base/razorqt-libs/Manifest
+++ b/razorqt-base/razorqt-libs/Manifest
@@ -1,6 +1,6 @@
 DIST razorqt-0.5.0.tar.bz2 10414360 SHA256 f6a0b941209d5be90c05fbf064c68fa2da9e27941be57cbfd2da028445e0a4b4 SHA512 1b92642c1fc7edd6d4e3f7e3882d481bc9f0eb51beebbf64d499d230d6e7bb369b5434c65025320626aae3f2465dcd365a5398e9284dd7652436d17887c21db4 WHIRLPOOL 444e15a0ee21bdabf9a0dc313f3f09ba2ac6fe234253816fc70261299ef61ed8e155694a2628a2d169d154ba143d4a0ebde5ddb27bb3c3b4491f4637328cd80a
 DIST razorqt-0.5.1.tar.bz2 10379213 SHA256 b301cc652e48256d6dfa804d63e6cefa06bbe965c30227edb0a6726b5689d74f SHA512 736e9f38a959cb70465e9d4331c912b26ca9c0ed1e354702a29e1f10b2aec95352b96c6af24022f447bc9526a4f6c77b10aa59cac620837c8355c99884323521 WHIRLPOOL 24dc1cf7366bf1843e65e5dc0286909e9b8f7a0de1bb1ebf189df803afeadb09c8a022c86e4272ea0b5d71b8f9608e0000e4d128dcf97c75d656d67f45a90120
-EBUILD razorqt-libs-0.5.0.ebuild 1149 SHA256 2a0048264a66e351b62c5e2bb58888d4e3828cd240cbab427c6367f228b26590 SHA512 2c2143722d8332421281c7b9773bd286ad92be5133cadfb1b7fd190284d08c07d1cccbc5697376d01069cd2c1445ea9b952d86f2c3d2ebe52442b5d330087a4c WHIRLPOOL 9bc3e26d93737ddb0412220a7ee022b0d42796ced41eda7fb23aa38d8a09be68d6dc6510d07dfc18b83a6da271948e4dee784466970b9995c60afd97403bb225
-EBUILD razorqt-libs-0.5.1.ebuild 1151 SHA256 af16f4673fcaf7c921bc7990dc81a777321e25ab20e4b15eb5afbfc0c55e181f SHA512 3fc21bd3bd24b5757f9338c0c2c3af1323fc3d39f5026c365d1f046024ece354b41c63f8aae89cc80b1dec7aa5e807106e62b36d62f455d51a63691793270b33 WHIRLPOOL 26146d6d061e093588d4f1496873d891045ef7c7b08b3ec7398a81ffe31164446d2827ad57f37fe0d6f89a6c86dd1f53f4094bcfd182678d61b16513e2afdfd9
-MISC ChangeLog 642 SHA256 26067ff5c15a49a6ff109b8a984a06c1d00ed55570aa01400759e44eb07979ac SHA512 2a02a2ab57a32dc9ab0f3bf91e069146be22c16ddb162d7bcd510abca51b7a345a979a707481c68a7de607526633b793fbc6c6876992853d93cc3b2316422b6b WHIRLPOOL 7285a11d5b020aba99292e36a3f95e36896ccec56b43eb9205e417e3a5fe74f41e7d029eca16cab6934b1bf35f32ce5c8a44733f5b4923387286fec6e95b6273
+EBUILD razorqt-libs-0.5.0.ebuild 1136 SHA256 ef931f4f0f4bb3da23a45c2c8c835faeac40d7ff90a598aae238649815efffb8 SHA512 5066af3b292678331386d8f4aafcb77ff6b7bdd70e64714fbe621ae6fad1f4eeb733fb38cd87ad08989addaaf480de766e0d1533ae84363d7f9880754e47674e WHIRLPOOL 8bf9b9175b0721e10d3ae675b4bced44a107274673c76b07c3ce00a7f6c3d641387d3fd55b35773ad26123cfbcee1b0774a9c32a757206da14a40819d71384f9
+EBUILD razorqt-libs-0.5.1.ebuild 1176 SHA256 81d716f8a991b94c2a4ae3f5fb56b13fadbea31e6029c2af73ab2323e621f102 SHA512 ab93944cc506a735ac3dd9be9d8b8e0136445df5747bd99a20231df6e5b37f365ed3100ce67bfed2b6036169db073a2bfde188acc53b2ce4cb40d2576af57738 WHIRLPOOL d7dfe3313ab785ecd778e0a26684a214728613ddf1856f412180b4883d2b66f357708f855141324270798499f6b7f5d6a7f2c66fdbcf0974ffdecc0a3ad68c22
+MISC ChangeLog 857 SHA256 f453c2b78ef38c3ac60dba290a2294d583be589d1d12012251a38fd3eba72691 SHA512 7cdf1852eafbc8d93ddb16b2ce165ee453b188356297f3047af1fb9f0e2829f5613006724850f6fee5fc852e796073b585eb9012af6edd6058135eb76ea2a5c9 WHIRLPOOL 6ce9a084a5adb3dd1b66b651383005a150044f08185baa1b5937d256978baf1fcab2adf1813be8454cd05b641518cea6dd7dbb7dcc8bc69a186081d4f52dfbb2
 MISC metadata.xml 157 SHA256 a2ffc792d4df94c3f8088e329c4bf74804540c2797f3e24ab0030acbdfd4b535 SHA512 9f259ee8df00db96dd396c6c886624c53728c3e26f28071cc1f9a286798271cdfac3485a081d308c93ff3067cb6568f9ea55ca164334abeee776491307244213 WHIRLPOOL bcb16b3d9ab21125e5581aed1225d2b399015d76bc7c6f9deae53e2e38fffdc47e0b5aae9bd632e85db242a37b4de5aa05d6f97c087cad085df9390530a0a597
diff --git a/razorqt-base/razorqt-libs/razorqt-libs-0.5.0.ebuild b/razorqt-base/razorqt-libs/razorqt-libs-0.5.0.ebuild
index 6cb67779858b..b9963a50e210 100644
--- a/razorqt-base/razorqt-libs/razorqt-libs-0.5.0.ebuild
+++ b/razorqt-base/razorqt-libs/razorqt-libs-0.5.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/razorqt-base/razorqt-libs/razorqt-libs-0.5.0.ebuild,v 1.1 2012/10/15 08:59:04 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/razorqt-base/razorqt-libs/razorqt-libs-0.5.0.ebuild,v 1.2 2013/01/17 05:54:38 yngwin Exp $
 
 EAPI=4
 inherit cmake-utils
@@ -14,7 +14,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_BRANCH="master"
 	KEYWORDS=""
 else
-	SRC_URI="https://github.com/downloads/Razor-qt/razor-qt/razorqt-${PV}.tar.bz2"
+	SRC_URI="mirror://github/Razor-qt/razor-qt/razorqt-${PV}.tar.bz2"
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/razorqt-${PV}"
 fi
diff --git a/razorqt-base/razorqt-libs/razorqt-libs-0.5.1.ebuild b/razorqt-base/razorqt-libs/razorqt-libs-0.5.1.ebuild
index e54cb83c645c..ff78f1abddfb 100644
--- a/razorqt-base/razorqt-libs/razorqt-libs-0.5.1.ebuild
+++ b/razorqt-base/razorqt-libs/razorqt-libs-0.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/razorqt-base/razorqt-libs/razorqt-libs-0.5.1.ebuild,v 1.2 2013/01/06 18:12:32 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/razorqt-base/razorqt-libs/razorqt-libs-0.5.1.ebuild,v 1.3 2013/01/17 05:54:38 yngwin Exp $
 
 EAPI=4
 inherit cmake-utils
@@ -14,7 +14,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_BRANCH="master"
 	KEYWORDS=""
 else
-	SRC_URI="https://github.com/downloads/Razor-qt/razor-qt/razorqt-${PV}.tar.bz2"
+	SRC_URI="mirror://github/Razor-qt/razor-qt/razorqt-${PV}.tar.bz2"
 	KEYWORDS="~amd64 ~ppc ~x86"
 	S="${WORKDIR}/razorqt-${PV}"
 fi
@@ -33,6 +33,7 @@ DEPEND="razorqt-base/libqtxdg
 	x11-libs/qt-core:4
 	x11-libs/qt-dbus:4
 	x11-libs/qt-gui:4
+	!<razorqt-base/razorqt-meta-0.5.0
 	!x11-wm/razorqt"
 RDEPEND="${DEPEND}"