summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin von Gagern <Martin.vGagern@gmx.net>2010-01-17 17:03:06 +0100
committerMartin von Gagern <Martin.vGagern@gmx.net>2010-01-17 17:21:17 +0100
commitf8f63f5ba8dfdd63505602c24f7bb182eb757adc (patch)
tree565685e4e95c6ab6044ddc805c35951e14eaad2b /dev-libs
parent[dev-libs/poppler-qt3-0.12.3] Version bump (diff)
downloadkde-sunset-f8f63f5ba8dfdd63505602c24f7bb182eb757adc.tar.gz
kde-sunset-f8f63f5ba8dfdd63505602c24f7bb182eb757adc.tar.bz2
kde-sunset-f8f63f5ba8dfdd63505602c24f7bb182eb757adc.zip
[dev-libs/dbus-qt3-old-0.70-r1] Block unslotted version.
This is necessary as this 0.70-r1 and the 0.70 in the main portage tree install the same files, leading to collisions. With the block in place, recent versions of portage will automatically uninstall the unslotted version, providing a smooth upgrade path.
Diffstat (limited to 'dev-libs')
-rw-r--r--dev-libs/dbus-qt3-old/ChangeLog5
-rw-r--r--dev-libs/dbus-qt3-old/Manifest4
-rw-r--r--dev-libs/dbus-qt3-old/dbus-qt3-old-0.70-r1.ebuild4
3 files changed, 10 insertions, 3 deletions
diff --git a/dev-libs/dbus-qt3-old/ChangeLog b/dev-libs/dbus-qt3-old/ChangeLog
index 1dcdcf94..36740412 100644
--- a/dev-libs/dbus-qt3-old/ChangeLog
+++ b/dev-libs/dbus-qt3-old/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-libs/dbus-qt3-old
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbus-qt3-old/ChangeLog,v 1.15 2009/01/13 15:24:14 cardoe Exp $
+
+ 17 Jan 2010; Martin von Gagern (MvG) <Martin.vGagern@gmx.net>
+ dbus-qt3-old-0.70.ebuild:
+ Block unslotted version.
*dbus-qt3-old-0.9 (16 Jan 2010)
diff --git a/dev-libs/dbus-qt3-old/Manifest b/dev-libs/dbus-qt3-old/Manifest
index 1111340d..9aa926ed 100644
--- a/dev-libs/dbus-qt3-old/Manifest
+++ b/dev-libs/dbus-qt3-old/Manifest
@@ -1,6 +1,6 @@
DIST dbus-1-qt3-0.9.tar.gz 450432 RMD160 4948475ebd361b91246d0a97ed1d08947b3396e4 SHA1 333f608c585e423d4b19d800d25a0081d03c4408 SHA256 45b0698da89627b49dc1ee66d2819c23eaec82316ef1316b8deeeb3d41a00e01
DIST dbus-qt3-0.70.tar.bz2 220305 RMD160 8e2e3919ea71d50966000239e435b41ead089b1b SHA1 d87cfd7af62d36cc98f0a01f3d7e66eb677b081a SHA256 d86531f106f8172a635d57ef35b7856cb54885c50f175bd1bff374c0e5a5f5ed
-EBUILD dbus-qt3-old-0.70-r1.ebuild 887 RMD160 63bf1fc19a4d06b5954d41b8ef2fc10e38c628dd SHA1 9468fc61f62ebb93dd0483c9b79c079b2a692e72 SHA256 fb005a9d3b718a98a66506427cdc73f8260cb5aa02da1a5d77bffc7a33e1a47f
+EBUILD dbus-qt3-old-0.70-r1.ebuild 942 RMD160 7c424740a3c605eb37aec8d10f592ca541dd0281 SHA1 f288aa4833c1be7141cae49642f240df709b5702 SHA256 b67a8c353f842527e1bbc03c4c3ca075ad84d49b3a8240b2992c8f4851e6a44b
EBUILD dbus-qt3-old-0.9.ebuild 735 RMD160 03e300334cb9219502394b37349e8aab70b1b857 SHA1 d9daa9eba7cb6cf4b54d183282daf3f538eca20b SHA256 7fadbf77de6afe4781e4d399ad4e70c76bcac4fccdf3eedf11c13299416a617c
-MISC ChangeLog 2260 RMD160 881d74234e3fd66429d98637245d7abceb6cbe67 SHA1 1184b270e9ed3b2b12cbb8ef06e437a78480816b SHA256 831e754bcea494026ac08f628ac0e3379ca7d4909918332c9ce6af1a2b7db412
+MISC ChangeLog 2273 RMD160 476bf9f28bbb547d4a3c5f98faa0405952b62df4 SHA1 77e5c9cdd11039bfc08a4dcdbc9847e565ab06e0 SHA256 3929cc5021ad239b1eaa4995322bbed58f99ba41672efbb66468990fd07949a2
MISC metadata.xml 164 RMD160 7d567afe05ca87a772eedf19f5b1fd1e2a9798a7 SHA1 e7b1ab05868d9feb1fa1677c052836fd7dd6a171 SHA256 66cdaff449660e99dfaee8d19b47413fc8ced6d5a1eccd3c842a48e9d9668d48
diff --git a/dev-libs/dbus-qt3-old/dbus-qt3-old-0.70-r1.ebuild b/dev-libs/dbus-qt3-old/dbus-qt3-old-0.70-r1.ebuild
index 4a5e9d23..6d875f50 100644
--- a/dev-libs/dbus-qt3-old/dbus-qt3-old-0.70-r1.ebuild
+++ b/dev-libs/dbus-qt3-old/dbus-qt3-old-0.70-r1.ebuild
@@ -2,6 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbus-qt3-old/dbus-qt3-old-0.70.ebuild,v 1.15 2008/08/18 18:50:28 rbu Exp $
+EAPI=2
+
inherit qt3
DESCRIPTION="D-BUS Qt3 bindings compatible with old application API and new dbus"
@@ -16,6 +18,8 @@ IUSE="debug"
RDEPEND=">=sys-apps/dbus-0.91"
DEPEND="${RDEPEND}
=x11-libs/qt-3*"
+RDEPEND="${RDEPEND}
+ !dev-libs/dbus-qt3-old:0"
S=${WORKDIR}/${P/-old}