From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A9CAB58973 for ; Thu, 4 Feb 2016 14:07:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5702621C018; Thu, 4 Feb 2016 14:07:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D598421C018 for ; Thu, 4 Feb 2016 14:07:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 911B9340A9F for ; Thu, 4 Feb 2016 14:07:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8471F11D for ; Thu, 4 Feb 2016 14:07:32 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1454594846.cf9a30d5f3583d7ed7e73d056d89926591ea7d1d.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/typesafe-config/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/typesafe-config/Manifest dev-java/typesafe-config/typesafe-config-1.2.1.ebuild dev-java/typesafe-config/typesafe-config-1.3.0-r1.ebuild dev-java/typesafe-config/typesafe-config-1.3.0-r2.ebuild X-VCS-Directories: dev-java/typesafe-config/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: cf9a30d5f3583d7ed7e73d056d89926591ea7d1d X-VCS-Branch: master Date: Thu, 4 Feb 2016 14:07:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ef709577-d72d-42d2-b2cc-16bc643f6990 X-Archives-Hash: 6bb174c80f17eb032948b89663be58ef commit: cf9a30d5f3583d7ed7e73d056d89926591ea7d1d Author: James Le Cuirot gentoo org> AuthorDate: Thu Feb 4 14:07:01 2016 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Thu Feb 4 14:07:26 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf9a30d5 dev-java/typesafe-config: Resolve bug #559748 once and for all typesafe-config-1.3.0 has a stable revdep (mchange-commons) but requires Java 8, which hasn't been stabilised yet. An ebuild depending on Java 6 was erroneously added to deal with this. We're not quite ready to stabilise Java 8 but we can't drop keywords either so I've added typesafe-config-1.2.1, which only requires Java 6. java-apicheck highlighted some differences but I've kept the same SLOT because mchange-commons works with either. Package-Manager: portage-2.2.27 dev-java/typesafe-config/Manifest | 2 +- ...fig-1.3.0-r1.ebuild => typesafe-config-1.2.1.ebuild} | 16 +++++----------- .../typesafe-config/typesafe-config-1.3.0-r2.ebuild | 17 ++++------------- 3 files changed, 10 insertions(+), 25 deletions(-) diff --git a/dev-java/typesafe-config/Manifest b/dev-java/typesafe-config/Manifest index 2e8f3ae..a824edf 100644 --- a/dev-java/typesafe-config/Manifest +++ b/dev-java/typesafe-config/Manifest @@ -1,2 +1,2 @@ +DIST typesafe-config-1.2.1.zip 287878 SHA256 b3d26a8959bc18b02f78d9ac94e691db7ca103020a700f4a1c9cbe45b254f44b SHA512 178f0df81f081b9355951debd3a5435c7d6aae25893f049917a25861015eba18a305d5370d914b89a7c46e55b5d9f3939ddd0656cfa9a4691bd16cf32c796502 WHIRLPOOL 591e2d61a477b681b842ef45166b1ecab6545d0002c78d3c13c57c0c6bb2a3ae5903cc0d095e2237aae3c284f7d71f2dbed7ca1889dc89a837a38cde06f5a039 DIST typesafe-config-1.3.0.zip 363061 SHA256 b3af059bd13e597c5de466595f620cb686d21cfb7abd5bae1fec82d16be42999 SHA512 8b9821de442dc24b8b7be4c5ebc91d57214a32dceda8dc160cfaf801f70b34d2a2df6f8b2cbb744d18be3fbc887f1666f431b52882edcbde408d8adf3681fec4 WHIRLPOOL b2a61f17a269e1d8a533e6235ecdfd2968f452499e4adba61f17b667fe5aa2c07556587f9104d60e990fa268a3220b811f5860f6dd08c2ecd4cb5868833ac1e2 -DIST v1.3.0.zip 363061 SHA256 b3af059bd13e597c5de466595f620cb686d21cfb7abd5bae1fec82d16be42999 SHA512 8b9821de442dc24b8b7be4c5ebc91d57214a32dceda8dc160cfaf801f70b34d2a2df6f8b2cbb744d18be3fbc887f1666f431b52882edcbde408d8adf3681fec4 WHIRLPOOL b2a61f17a269e1d8a533e6235ecdfd2968f452499e4adba61f17b667fe5aa2c07556587f9104d60e990fa268a3220b811f5860f6dd08c2ecd4cb5868833ac1e2 diff --git a/dev-java/typesafe-config/typesafe-config-1.3.0-r1.ebuild b/dev-java/typesafe-config/typesafe-config-1.2.1.ebuild similarity index 68% rename from dev-java/typesafe-config/typesafe-config-1.3.0-r1.ebuild rename to dev-java/typesafe-config/typesafe-config-1.2.1.ebuild index dc19c36..dadedee 100644 --- a/dev-java/typesafe-config/typesafe-config-1.3.0-r1.ebuild +++ b/dev-java/typesafe-config/typesafe-config-1.2.1.ebuild @@ -8,22 +8,16 @@ JAVA_PKG_IUSE="doc source" inherit java-pkg-2 java-pkg-simple -DESCRIPTION="a library of arguably useful Java utilities" +DESCRIPTION="A library of arguably useful Java utilities" HOMEPAGE="https://github.com/typesafehub/config" -SRC_URI="https://github.com/typesafehub/config/archive/v${PV}.zip" +SRC_URI="https://github.com/typesafehub/config/archive/v${PV}.zip -> ${P}.zip" LICENSE="Apache-2.0" SLOT="0" KEYWORDS="amd64 ppc64 x86" IUSE="doc source" -CDEPEND="" +RDEPEND=">=virtual/jre-1.6" -RDEPEND=" - ${CDEPEND} - >=virtual/jre-1.6" - -DEPEND=" - ${CDEPEND} - app-arch/zip - >=virtual/jdk-1.6" +DEPEND=">=virtual/jdk-1.6 + app-arch/zip" diff --git a/dev-java/typesafe-config/typesafe-config-1.3.0-r2.ebuild b/dev-java/typesafe-config/typesafe-config-1.3.0-r2.ebuild index 14e2073..436b08b 100644 --- a/dev-java/typesafe-config/typesafe-config-1.3.0-r2.ebuild +++ b/dev-java/typesafe-config/typesafe-config-1.3.0-r2.ebuild @@ -8,25 +8,16 @@ JAVA_PKG_IUSE="doc source" inherit java-pkg-2 java-pkg-simple -DESCRIPTION="a library of arguably useful Java utilities" +DESCRIPTION="A library of arguably useful Java utilities" HOMEPAGE="https://github.com/typesafehub/config" SRC_URI="https://github.com/typesafehub/config/archive/v${PV}.zip -> ${P}.zip" -# BEWARE when removing r1! There's a string of deps relying on ppc+ppc64 that -# has to be sorted first. -# See https://bugs.gentoo.org/show_bug.cgi?id=571316 LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="doc source" -CDEPEND="" +RDEPEND=">=virtual/jre-1.8" -RDEPEND=" - ${CDEPEND} - >=virtual/jre-1.8" - -DEPEND=" - ${CDEPEND} - app-arch/zip - >=virtual/jdk-1.8" +DEPEND=">=virtual/jdk-1.8 + app-arch/zip"