Merge updates from master

This commit is contained in:
Repository QA checks
2015-08-28 17:27:28 -04:00
4 changed files with 1 additions and 73 deletions
-1
View File
@@ -1,3 +1,2 @@
DIST jarbundler-1.7.tar.gz 109484 SHA256 e727488efa0a990beca9343ad8050875ea459ea913aa7d54eeffc54c4a590ad2 SHA512 f3572fcf857c87fb6ff2c396f5da7502164a13e54a8adba1f9e6eece85c1a59509a3215443ca7d692992eac435bf4e962cc17f5ef64be0d0f676db563ade942a WHIRLPOOL 0a2f450980a6ccf954d75fd19b9e285054d0feb17d7913646e4875bd1273a5ed52236e3c34cab352e9168e71c7d339c6922ba73c66c2f8ecddaac3a53d6a4209
DIST jarbundler-1.8.1.tar.gz 132101 SHA256 19f670035bfe13409dd562753b32144f4597fb56782a7baf604ec034a5f4f6a2 SHA512 f18657aaaae749846544fc35b65fe5e548a0471d85bf4e1d671bf1c7309f2392487069e880ce5f9c1a0e076637dddd9274d536969a9df5401331835f881553b4 WHIRLPOOL fb80abf779f7ebadcb331ffc785a6ae99063955b5fafbaaca1edc1fd6ee4a1730ef3ce20c312c3d6eca7827ee47d9e62dbe3a78268e11890742c2f2d165468bf
DIST jarbundler.zip 159874 SHA256 6fb64f13d466804fa0ca0767708a0cc9cf1db1ed7904dc92afca188608ab9a6e SHA512 8b8b45533c601d10b6f986b913b824bb05617ac0901f178ee3fcfbdffa41ca060325228f71e62c4dfade778d50dd2040504eabf49311d386d75b82f77a535280 WHIRLPOOL 3676b6fabacc4054575cb5e5cf509a848d20222b28de1dad2ae0859f3b82ca070f294bb227849a3bb9a6a7662af45442a2fcb1502450a2cc7fe36c0e8be20245
-30
View File
@@ -1,30 +0,0 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
JAVA_PKG_IUSE="doc source"
inherit java-pkg-2 java-ant-2
DESCRIPTION="Jar Bundler Ant Task"
HOMEPAGE="http://www.loomcom.com/jarbundler/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE=""
DEPEND=">=virtual/jdk-1.4"
RDEPEND=">=virtual/jre-1.4
dev-java/ant-core"
src_compile() {
eant jar -Dant.jar="$(java-pkg_getjar ant-core ant.jar)" $(use_doc javadocs)
}
src_install() {
java-pkg_newjar "build/${P}.jar"
use doc && java-pkg_dojavadoc javadoc/
use source && java-pkg_dosrc src/*
}
@@ -1,41 +0,0 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
JAVA_PKG_IUSE="doc source"
inherit java-pkg-2 java-ant-2
DESCRIPTION="Jar Bundler Ant Task"
HOMEPAGE="http://www.loomcom.com/jarbundler/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE=""
COMMON_DEP=">=dev-java/xerces-2.8.1"
DEPEND=">=virtual/jdk-1.4
${COMMON_DEP}"
RDEPEND="
>=virtual/jre-1.4
>=dev-java/ant-core-1.7
${COMMON_DEP}"
src_unpack() {
unpack ${A}
cd "${S}"
rm -v *.jar || die
java-ant_rewrite-classpath
}
EANT_GENTOO_CLASSPATH="ant-core,xerces-2"
EANT_DOC_TARGET="javadocs"
src_install() {
java-pkg_newjar "build/${P}.jar"
java-pkg_register-ant-task
use doc && java-pkg_dojavadoc javadoc/
use source && java-pkg_dosrc src/*
}
+1 -1
View File
@@ -118,7 +118,7 @@ RDEPEND="
)
openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
vaapi? ( >=x11-libs/libva-0.35.0:=[${MULTILIB_USEDEP}] )
vdpau? ( >=x11-libs/libvdpau-0.7:=[${MULTILIB_USEDEP}] )
vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
wayland? ( >=dev-libs/wayland-1.2.0:=[${MULTILIB_USEDEP}] )
xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,${MULTILIB_USEDEP}]