summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen de Groot <yngwin@gentoo.org>2013-01-17 05:54:38 +0000
committerBen de Groot <yngwin@gentoo.org>2013-01-17 05:54:38 +0000
commit1335a923334c21b78733d61021e3e8462965c49d (patch)
tree01dd8656a290d1cd7e4e5a482b878adde005cebd /razorqt-base/razorqt-libs
parentVersion bump, wrt bug #452606 (diff)
downloadgentoo-2-1335a923334c21b78733d61021e3e8462965c49d.tar.gz
gentoo-2-1335a923334c21b78733d61021e3e8462965c49d.tar.bz2
gentoo-2-1335a923334c21b78733d61021e3e8462965c49d.zip
Add blocker to <razorqt-base/razorqt-meta-0.5.0 to fix file collisions, bug #452560. Fix mirror usage.
(Portage version: 2.2.0_alpha152/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'razorqt-base/razorqt-libs')
-rw-r--r--razorqt-base/razorqt-libs/ChangeLog7
-rw-r--r--razorqt-base/razorqt-libs/razorqt-libs-0.5.0.ebuild6
-rw-r--r--razorqt-base/razorqt-libs/razorqt-libs-0.5.1.ebuild5
3 files changed, 12 insertions, 6 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/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}"