From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 86CD61396D0 for ; Thu, 31 Aug 2017 19:56:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 05FD3E0DA4; Thu, 31 Aug 2017 19:56:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C763AE0DA4 for ; Thu, 31 Aug 2017 19:56:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DD77933BE95 for ; Thu, 31 Aug 2017 19:56:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6CE27896C for ; Thu, 31 Aug 2017 19:55:58 +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: <1504209339.8d9df599d7e638c6ac5f9ecdf849373250f53e4a.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/guice/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/guice/Manifest dev-java/guice/guice-4.0.ebuild X-VCS-Directories: dev-java/guice/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: 8d9df599d7e638c6ac5f9ecdf849373250f53e4a X-VCS-Branch: master Date: Thu, 31 Aug 2017 19:55:58 +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: 9e2dec21-2d7c-4cdf-9b4d-36b712f409eb X-Archives-Hash: ec2859e9c04b23bbb1dee0b5ef62f433 commit: 8d9df599d7e638c6ac5f9ecdf849373250f53e4a Author: James Le Cuirot gentoo org> AuthorDate: Thu Aug 31 19:54:12 2017 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Thu Aug 31 19:55:39 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d9df599 dev-java/guice: Remove old 4.0 Package-Manager: Portage-2.3.8, Repoman-2.3.2 dev-java/guice/Manifest | 1 - dev-java/guice/guice-4.0.ebuild | 75 ----------------------------------------- 2 files changed, 76 deletions(-) diff --git a/dev-java/guice/Manifest b/dev-java/guice/Manifest index b2625456c16..85b87a53e96 100644 --- a/dev-java/guice/Manifest +++ b/dev-java/guice/Manifest @@ -1,2 +1 @@ -DIST guice-4.0.tar.gz 23103592 SHA256 353cd5130d6e7f5bdb702af2e6b4f8aedd6e152c276275a6adcf5bbefade4ddb SHA512 45bdc00ebbad051f1f31b7cb5c134e42c841a06513563abc184739a514f39bc76dcb220af77ec60f46a0d887df93e0177ce071110b41ef6e5e69bad1a30f0e40 WHIRLPOOL 7b9b1d41b5256592ae5ccbd550b008d4cd10a50e7007a3c2b3d9b5cfaaa144f43be2d398386a762d9ca4afa76b30d4ec40aed2a9c9fd1c731f359de23c3be0df DIST guice-4.1.tar.gz 23212767 SHA256 77650231a0b12c0f0551202ae4dcfc1a4364e090f461cc3d21616d45bfc49537 SHA512 b42c6475a1d17c111a2ca278ac007bee541806685c0938c66f638808bd81d58aa99ba5aef2e4d8320dd5014df4307c5d2dd192111f4610c73a1eeef328771c00 WHIRLPOOL 9566d12d7cc001f7ddc0b3b972d06664f246a44d0dc0c2c02435f544417781c2f3cb7cce0fc21846297736f79ed59011aaaf2d2b65b08220c3d45acfdba8c76b diff --git a/dev-java/guice/guice-4.0.ebuild b/dev-java/guice/guice-4.0.ebuild deleted file mode 100644 index 432869d3327..00000000000 --- a/dev-java/guice/guice-4.0.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -JAVA_PKG_IUSE="source" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Guice is a lightweight dependency injection framework for Java 5 and above" -HOMEPAGE="https://github.com/google/guice/" -SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="4" -KEYWORDS="amd64 x86" - -IUSE="" - -CDEPEND="dev-java/aopalliance:1 - dev-java/asm:4 - dev-java/guava:18 - >=dev-java/cglib-3.1:3 - >=dev-java/jarjar-1.4:1 - dev-java/javax-inject:0" - -RDEPEND=">=virtual/jre-1.6 - ${CDEPEND}" - -DEPEND=">=virtual/jdk-1.6 - ${CDEPEND}" - -RESTRICT="test" - -JAVA_PKG_BSFIX_NAME="build.xml common.xml servlet/build.xml" -JAVA_ANT_REWRITE_CLASSPATH="yes" - -EANT_GENTOO_CLASSPATH=" - asm-4 - cglib-3 - guava-18 - javax-inject - aopalliance-1 -" - -java_prepare() { - # Where could we get this FREAKIN jar? - cp ./lib/build/bnd-0.0.384.jar "${T}" || die - - find . -name '*.jar' -exec rm -v {} + || die - find . -name '*.class' -exec rm -v {} + || die - - cp "${T}"/*.jar ./lib/build/ || die - - java-pkg_jar-from --into lib cglib-3 cglib.jar cglib-3.1.jar - java-pkg_jar-from --into lib/build cglib-3 cglib.jar cglib-3.1.jar - - java-pkg_jar-from --into lib asm-4 - java-pkg_jar-from --into lib/build asm-4 - java-pkg_jar-from --into lib/build asm-4 asm.jar asm-5.0.3.jar - - java-pkg_jar-from --into lib guava-18 - java-pkg_jar-from --into lib javax-inject - java-pkg_jar-from --into lib aopalliance-1 -} - -src_compile() { - ANT_TASKS="jarjar-1" \ - java-pkg-2_src_compile -} - -src_install() { - java-pkg_newjar build/dist/"${PN}"-snapshot.jar "${PN}".jar - use source && java-pkg_dosrc core/src/com -}