diff options
author | 2017-01-24 08:42:01 +0000 | |
---|---|---|
committer | 2017-01-24 08:42:01 +0000 | |
commit | 1d99be205efc0576e9f5bc57a92072a371635976 (patch) | |
tree | 4f8267cadd375657b008196b89fd65d71d7dbe8c | |
parent | 2017-01-24 07:42:24 UTC (diff) | |
parent | dev-java/oracle-jre-bin: x86 stable wrt bug #606118 (diff) | |
download | gentoo-1d99be205efc0576e9f5bc57a92072a371635976.tar.gz gentoo-1d99be205efc0576e9f5bc57a92072a371635976.tar.bz2 gentoo-1d99be205efc0576e9f5bc57a92072a371635976.zip |
Merge updates from master
-rw-r--r-- | dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.121.ebuild | 2 | ||||
-rw-r--r-- | dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.121.ebuild | 2 | ||||
-rw-r--r-- | net-nds/openldap/openldap-2.4.44.ebuild | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.121.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.121.ebuild index be82065881cb..65bd0446425d 100644 --- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.121.ebuild +++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.121.ebuild @@ -60,7 +60,7 @@ SRC_URI+=" jce? ( ${JCE_FILE} )" LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )" SLOT="1.8" -KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris" +KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris" IUSE="alsa commercial cups derby doc examples +fontconfig headless-awt javafx jce nsplugin selinux source" REQUIRED_USE="javafx? ( alsa fontconfig )" diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.121.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.121.ebuild index dfc1de347a44..ceba82c425e2 100644 --- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.121.ebuild +++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.121.ebuild @@ -34,7 +34,7 @@ SRC_URI=" LICENSE="Oracle-BCLA-JavaSE" SLOT="1.8" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="alsa commercial cups +fontconfig headless-awt javafx jce nsplugin selinux" RESTRICT="fetch preserve-libs strip" diff --git a/net-nds/openldap/openldap-2.4.44.ebuild b/net-nds/openldap/openldap-2.4.44.ebuild index 4b43621e84ae..7b965775409c 100644 --- a/net-nds/openldap/openldap-2.4.44.ebuild +++ b/net-nds/openldap/openldap-2.4.44.ebuild @@ -19,7 +19,7 @@ SRC_URI="ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${P}.tgz LICENSE="OPENLDAP GPL-2" SLOT="0" -KEYWORDS="alpha ~amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" IUSE_DAEMON="crypt icu samba slp tcpd experimental minimal" IUSE_BACKEND="+berkdb" |