summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2009-04-15 15:14:28 +0200
committerTomas Chvatal <scarabeus@gentoo.org>2009-04-15 15:14:28 +0200
commit6b50cf897084e66f2240d20c363ff9592944220b (patch)
tree357816ee69f454946b7dceca0dee6a32a534d32d
parenta53097c0022ae6853509942ecfdc7a430eea7538 (diff)
downloadkde-6b50cf897084e66f2240d20c363ff9592944220b.tar.gz
kde-6b50cf897084e66f2240d20c363ff9592944220b.tar.bz2
kde-6b50cf897084e66f2240d20c363ff9592944220b.zip
Sync with tree.
-rw-r--r--kde-base/pykde4/Manifest4
-rw-r--r--kde-base/pykde4/pykde4-4.2.69.ebuild5
-rw-r--r--kde-base/pykde4/pykde4-9999.ebuild5
3 files changed, 10 insertions, 4 deletions
diff --git a/kde-base/pykde4/Manifest b/kde-base/pykde4/Manifest
index 7ccd32ab912..28fb69f782d 100644
--- a/kde-base/pykde4/Manifest
+++ b/kde-base/pykde4/Manifest
@@ -1,5 +1,5 @@
DIST kdebindings-4.2.69.tar.lzma 3837092 RMD160 4b476e373736a640675a19c87b13955ee4b24e22 SHA1 a8b81b87bc71eba7221d42a1950c0ca381ec1212 SHA256 ac0a897efd02c513687f43cd4dbc7721bb7d0889c8620c6b30330730c5a9bcc3
-EBUILD pykde4-4.2.69.ebuild 1729 RMD160 184b2a9c3c39296400f389aaa301ac6d7d432ecf SHA1 2be0fd74707431ae55036874132d517d8f31bc10 SHA256 88f8ce9e8f13c32946487227bc770f0281ea61e5b46bab781b8b82ee390e3d54
-EBUILD pykde4-9999.ebuild 1705 RMD160 860a9352584d4caa0976f40f8907a3ad1c807ad7 SHA1 ade9732791187dc4c107e3193f1ec734271996ed SHA256 63d99e2594796ecabf9e6edd7f55bcd30298f2258eca3ca9d91b9eacfbf12241
+EBUILD pykde4-4.2.69.ebuild 1823 RMD160 f8a3306cf7d82fc8a3e6317f66498a032293f330 SHA1 b4d926c771293584bcbac964e9d18a005beb9377 SHA256 49467c7fc7aacfe7b12861ec6946bf590e2cde2517c7a9a5a626483a2717f2a3
+EBUILD pykde4-9999.ebuild 1799 RMD160 5359c6e71b7d9b45f9f605dc5dac19c5f8f26206 SHA1 3d6fef4cf7cc7db491100744d6d3a577ca7f046a SHA256 e15fe0a0d0556abd0169e2f7c7c1cce65585e9e3ab7339dd15a961db05ca5d01
MISC ChangeLog 5975 RMD160 d6020d022d4a1f09df5acb9f1f59a1a2631b1c8a SHA1 5c608ca4675013426d6443353d2da06b99b14c52 SHA256 142ad859ea81ae082cfedefc74b8be85bc4d51b223db0f8f215a7cd2594c0b13
MISC metadata.xml 329 RMD160 6424cd6e9a3dffa1ef07462160d03733beff3e02 SHA1 3a06ca30f6526a47772713084e9e36ca8a83e41b SHA256 e449422e44fd1a613b5810fe876de7fbdd4ff9ad97b40057af758061bb2607f8
diff --git a/kde-base/pykde4/pykde4-4.2.69.ebuild b/kde-base/pykde4/pykde4-4.2.69.ebuild
index fd5766ce391..7145113d81a 100644
--- a/kde-base/pykde4/pykde4-4.2.69.ebuild
+++ b/kde-base/pykde4/pykde4-4.2.69.ebuild
@@ -18,7 +18,10 @@ DEPEND="
>=kde-base/kdelibs-${PV}:${SLOT}[kdeprefix=,opengl,semantic-desktop?]
akonadi? ( >=kde-base/kdepimlibs-${PV}:${SLOT}[kdeprefix=] )
"
-RDEPEND="${DEPEND}"
+# blocker added due to compatibility issues and error during compile time
+RDEPEND="${DEPEND}
+ !dev-python/pykde
+"
src_prepare() {
kde4-meta_src_prepare
diff --git a/kde-base/pykde4/pykde4-9999.ebuild b/kde-base/pykde4/pykde4-9999.ebuild
index 82b1a484716..5378ae1fc70 100644
--- a/kde-base/pykde4/pykde4-9999.ebuild
+++ b/kde-base/pykde4/pykde4-9999.ebuild
@@ -18,7 +18,10 @@ DEPEND="
>=kde-base/kdelibs-${PV}:${SLOT}[kdeprefix=,opengl,semantic-desktop?]
akonadi? ( >=kde-base/kdepimlibs-${PV}:${SLOT}[kdeprefix=] )
"
-RDEPEND="${DEPEND}"
+# blocker added due to compatibility issues and error during compile time
+RDEPEND="${DEPEND}
+ !dev-python/pykde
+"
src_prepare() {
kde4-meta_src_prepare