commit: 633ccc991a7e04d6f1a827af0db7459a42fc4d5e
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 26 10:41:26 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Aug 26 11:01:06 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=633ccc99
dev-util/android-sdk-update-manager: Remove support for non-existent deps
.../android-sdk-update-manager-22.0.1-r1.ebuild | 2 +-
.../android-sdk-update-manager/android-sdk-update-manager-22.0.4.ebuild | 2 +-
.../android-sdk-update-manager-22.0.5-r1.ebuild | 2 +-
.../android-sdk-update-manager/android-sdk-update-manager-22.0.5.ebuild | 2 +-
.../android-sdk-update-manager/android-sdk-update-manager-22.2.1.ebuild | 2 +-
.../android-sdk-update-manager/android-sdk-update-manager-22.3.ebuild | 2 +-
.../android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild | 2 +-
.../android-sdk-update-manager/android-sdk-update-manager-22.6.ebuild | 2 +-
.../android-sdk-update-manager/android-sdk-update-manager-23-r1.ebuild | 2 +-
.../android-sdk-update-manager/android-sdk-update-manager-23.ebuild | 2 +-
.../android-sdk-update-manager/android-sdk-update-manager-24.4.1.ebuild | 2 +-
11 files changed, 11 insertions(+), 11 deletions(-)
diff --git
a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1-r1.ebuild
b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1-r1.ebuild
index f812d83f4ed..35615393b47 100644
---
a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1-r1.ebuild
+++
b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1-r1.ebuild
@@ -21,7 +21,7 @@ DEPEND="app-arch/tar
app-arch/gzip"
RDEPEND=">=virtual/jdk-1.5
>=dev-java/ant-core-1.6.5
- || ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
+ dev-java/swt:3.7[cairo]
>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
"
diff --git
a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.4.ebuild
b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.4.ebuild
index f812d83f4ed..35615393b47 100644
---
a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.4.ebuild
+++
b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.4.ebuild
@@ -21,7 +21,7 @@ DEPEND="app-arch/tar
app-arch/gzip"
RDEPEND=">=virtual/jdk-1.5
>=dev-java/ant-core-1.6.5
- || ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
+ dev-java/swt:3.7[cairo]
>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
"
diff --git
a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5-r1.ebuild
b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5-r1.ebuild
index 173fd895298..86465a22ddb 100644
---
a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5-r1.ebuild
+++
b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5-r1.ebuild
@@ -21,7 +21,7 @@ DEPEND="app-arch/tar
app-arch/gzip"
RDEPEND=">=virtual/jdk-1.5
>=dev-java/ant-core-1.6.5
- || ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
+ dev-java/swt:3.7[cairo]
>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
"
diff --git
a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5.ebuild
b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5.ebuild
index f812d83f4ed..35615393b47 100644
---
a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5.ebuild
+++
b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5.ebuild
@@ -21,7 +21,7 @@ DEPEND="app-arch/tar
app-arch/gzip"
RDEPEND=">=virtual/jdk-1.5
>=dev-java/ant-core-1.6.5
- || ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
+ dev-java/swt:3.7[cairo]
>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
"
diff --git
a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.2.1.ebuild
b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.2.1.ebuild
index 173fd895298..86465a22ddb 100644
---
a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.2.1.ebuild
+++
b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.2.1.ebuild
@@ -21,7 +21,7 @@ DEPEND="app-arch/tar
app-arch/gzip"
RDEPEND=">=virtual/jdk-1.5
>=dev-java/ant-core-1.6.5
- || ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
+ dev-java/swt:3.7[cairo]
>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
"
diff --git
a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.3.ebuild
b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.3.ebuild
index 56e4c80f137..6db41505494 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.3.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.3.ebuild
@@ -21,7 +21,7 @@ DEPEND="app-arch/tar
app-arch/gzip"
RDEPEND=">=virtual/jdk-1.5
>=dev-java/ant-core-1.6.5
- || ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
+ dev-java/swt:3.7[cairo]
>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
"
diff --git
a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild
b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild
index 56e4c80f137..6db41505494 100644
---
a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild
+++
b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild
@@ -21,7 +21,7 @@ DEPEND="app-arch/tar
app-arch/gzip"
RDEPEND=">=virtual/jdk-1.5
>=dev-java/ant-core-1.6.5
- || ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
+ dev-java/swt:3.7[cairo]
>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
"
diff --git
a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.ebuild
b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.ebuild
index 56e4c80f137..6db41505494 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.ebuild
@@ -21,7 +21,7 @@ DEPEND="app-arch/tar
app-arch/gzip"
RDEPEND=">=virtual/jdk-1.5
>=dev-java/ant-core-1.6.5
- || ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
+ dev-java/swt:3.7[cairo]
>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
"
diff --git
a/dev-util/android-sdk-update-manager/android-sdk-update-manager-23-r1.ebuild
b/dev-util/android-sdk-update-manager/android-sdk-update-manager-23-r1.ebuild
index 5178faa3931..8593117128e 100644
---
a/dev-util/android-sdk-update-manager/android-sdk-update-manager-23-r1.ebuild
+++
b/dev-util/android-sdk-update-manager/android-sdk-update-manager-23-r1.ebuild
@@ -21,7 +21,7 @@ DEPEND="app-arch/tar
app-arch/gzip"
RDEPEND=">=virtual/jdk-1.5
>=dev-java/ant-core-1.6.5
- || ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
+ dev-java/swt:3.7[cairo]
sys-libs/zlib[abi_x86_32(-)]
"
diff --git
a/dev-util/android-sdk-update-manager/android-sdk-update-manager-23.ebuild
b/dev-util/android-sdk-update-manager/android-sdk-update-manager-23.ebuild
index 20463eb949f..92937bbca47 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-23.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-23.ebuild
@@ -21,7 +21,7 @@ DEPEND="app-arch/tar
app-arch/gzip"
RDEPEND=">=virtual/jdk-1.5
>=dev-java/ant-core-1.6.5
- || ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
+ dev-java/swt:3.7[cairo]
sys-libs/zlib[abi_x86_32(-)]
"
diff --git
a/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1.ebuild
b/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1.ebuild
index 5178faa3931..8593117128e 100644
---
a/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1.ebuild
+++
b/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1.ebuild
@@ -21,7 +21,7 @@ DEPEND="app-arch/tar
app-arch/gzip"
RDEPEND=">=virtual/jdk-1.5
>=dev-java/ant-core-1.6.5
- || ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
+ dev-java/swt:3.7[cairo]
sys-libs/zlib[abi_x86_32(-)]
"
