summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorabcd <abcd@gentoo.org>2009-12-31 01:03:37 -0500
committerabcd <abcd@gentoo.org>2009-12-31 13:37:29 -0500
commitfc70cd4ecc49c4b738c1620390d90384641817a8 (patch)
tree3f2479a8ca0ee109880ce785ed5375e06a5873cb
parent56c1a65993592e7a55373f4d0abf1cec6ba9e0b1 (diff)
downloadkde-fc70cd4ecc49c4b738c1620390d90384641817a8.tar.gz
kde-fc70cd4ecc49c4b738c1620390d90384641817a8.tar.bz2
kde-fc70cd4ecc49c4b738c1620390d90384641817a8.zip
[sys-auth/pol{,icy}kit-qt] Examples for polkit-qt/policykit-qt collide, so only allow one or the other
-rw-r--r--sys-auth/policykit-qt/Manifest2
-rw-r--r--sys-auth/policykit-qt/policykit-qt-9999.ebuild7
-rw-r--r--sys-auth/polkit-qt/Manifest4
-rw-r--r--sys-auth/polkit-qt/polkit-qt-0.95.1.ebuild7
-rw-r--r--sys-auth/polkit-qt/polkit-qt-9999.ebuild7
5 files changed, 18 insertions, 9 deletions
diff --git a/sys-auth/policykit-qt/Manifest b/sys-auth/policykit-qt/Manifest
index 4ba0870038c..bfdf0740091 100644
--- a/sys-auth/policykit-qt/Manifest
+++ b/sys-auth/policykit-qt/Manifest
@@ -1,2 +1,2 @@
-EBUILD policykit-qt-9999.ebuild 586 RMD160 44f22ffc972b72fd58086ee0e388776c52e1cc71 SHA1 4a72b5e85b4babff1d5a4afdb401527d19f932ab SHA256 9355b162550967bd26a60ea163135b5b0fcb8c7fefeec02bae3caab882299aeb
+EBUILD policykit-qt-9999.ebuild 671 RMD160 9050bc6b04a5e0ce3090fac7add4d07dc436e7c4 SHA1 33aa8d4040052aed488357eb3e84d08d1baca4f7 SHA256 188ebc06e1e453556e7d1b286e2c894c570eedb40d4de9ae1f0096c63807204d
MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/sys-auth/policykit-qt/policykit-qt-9999.ebuild b/sys-auth/policykit-qt/policykit-qt-9999.ebuild
index a217eaf42b4..ead4cafad4b 100644
--- a/sys-auth/policykit-qt/policykit-qt-9999.ebuild
+++ b/sys-auth/policykit-qt/policykit-qt-9999.ebuild
@@ -15,13 +15,16 @@ KEYWORDS=""
SLOT="0"
IUSE="debug examples"
-RDEPEND="
+COMMON_DEPEND="
>=sys-auth/policykit-0.8
>=x11-libs/qt-gui-4.4:4[dbus]
"
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
kde-base/automoc
"
+RDEPEND="${COMMON_DEPEND}
+ examples? ( !sys-auth/polkit-qt[examples] )
+"
src_configure() {
mycmakeargs=(
diff --git a/sys-auth/polkit-qt/Manifest b/sys-auth/polkit-qt/Manifest
index 144bcc7657f..7c6cf6e84e6 100644
--- a/sys-auth/polkit-qt/Manifest
+++ b/sys-auth/polkit-qt/Manifest
@@ -1,4 +1,4 @@
DIST polkit-qt-1-0.95.1.tar.bz2 63861 RMD160 79b8c888061f6bccc9933f9e6c8e3c96de40f298 SHA1 e0d2fd7fc5734d384ce8ca3fda813105cd33e183 SHA256 98ac66a4def7b0f6ee545a743d5f11978d578f2d47a3a3d459b83a8265b7e843
-EBUILD polkit-qt-0.95.1.ebuild 648 RMD160 5ca9535009c9d3ed00b52f29799bb3c8b1ff1e52 SHA1 5f23ddbfcb6652cc8b029f1a6a14292061e36bb7 SHA256 41b96a676e870705896f2b831a263d41f113f11f77309bd7ab40d5f4c6fcae9a
-EBUILD polkit-qt-9999.ebuild 662 RMD160 5b583006d57270f83b421eb38fbe310eff845297 SHA1 b784fbbb145ccd07a3300f89b38aafb99836d88d SHA256 7c48458f223957a396f544a48441a57701d462844e69e155db3cf2983200b219
+EBUILD polkit-qt-0.95.1.ebuild 736 RMD160 41f956f38c5827e9a2a8fa8f41b11510fbdc81a2 SHA1 c6bfe4634f0aa8fdb18a656ca211d51bea9a8316 SHA256 27a9509990c1f43bfb978470fff1368a1c65e04866cf00c2240e08523e38d1d8
+EBUILD polkit-qt-9999.ebuild 750 RMD160 44b75ac2a51e2caf867723eb771c4f2d18701e71 SHA1 71ef268432f474a9bdfa2fd2e42c2fe9cb74f50b SHA256 00f563eb15f12860fbbb69e9fbb7e8b354c6b191bb360d21b5494d8b1ec02894
MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/sys-auth/polkit-qt/polkit-qt-0.95.1.ebuild b/sys-auth/polkit-qt/polkit-qt-0.95.1.ebuild
index 0049ea512a7..ac04f1701d1 100644
--- a/sys-auth/polkit-qt/polkit-qt-0.95.1.ebuild
+++ b/sys-auth/polkit-qt/polkit-qt-0.95.1.ebuild
@@ -17,13 +17,16 @@ KEYWORDS="~amd64 ~x86"
SLOT="0"
IUSE="debug examples"
-RDEPEND="
+COMMON_DEPEND="
>=sys-auth/polkit-0.95
x11-libs/qt-gui[dbus]
"
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
kde-base/automoc
"
+RDEPEND="${COMMON_DEPEND}
+ examples? ( !sys-auth/policykit-qt[examples] )
+"
DOCS="AUTHORS README README.porting TODO"
diff --git a/sys-auth/polkit-qt/polkit-qt-9999.ebuild b/sys-auth/polkit-qt/polkit-qt-9999.ebuild
index bb814ea8bbe..22e9ec49d8d 100644
--- a/sys-auth/polkit-qt/polkit-qt-9999.ebuild
+++ b/sys-auth/polkit-qt/polkit-qt-9999.ebuild
@@ -15,13 +15,16 @@ KEYWORDS=""
SLOT="0"
IUSE="debug examples"
-RDEPEND="
+COMMON_DEPEND="
>=sys-auth/polkit-0.95
x11-libs/qt-gui[dbus]
"
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
kde-base/automoc
"
+RDEPEND="${COMMON_DEPEND}
+ examples? ( !sys-auth/policykit-qt[examples] )
+"
DOCS="AUTHORS README README.porting TODO"