Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository QA checks <repo-qa-checks@gentoo.org>2017-09-22 21:23:26 +0000
committerRepository QA checks <repo-qa-checks@gentoo.org>2017-09-22 21:23:26 +0000
commit20b52621a865cad5809d4c53f02ee126b8aa5dc9 (patch)
treec4c4cc29a7a5fde8ab67b451cc26ae92c860e821
parent2017-09-22 20:04:06 UTC (diff)
parentdev-libs/libbytesize: Removed old. (diff)
downloadgentoo-20b52621a865cad5809d4c53f02ee126b8aa5dc9.tar.gz
gentoo-20b52621a865cad5809d4c53f02ee126b8aa5dc9.tar.bz2
gentoo-20b52621a865cad5809d4c53f02ee126b8aa5dc9.zip
Merge updates from master
Diffstat
-rw-r--r--dev-java/netty-codec-http/netty-codec-http-4.0.36.ebuild2
-rw-r--r--dev-java/netty-codec/netty-codec-4.0.36.ebuild2
-rw-r--r--dev-libs/libbytesize/Manifest2
-rw-r--r--dev-libs/libbytesize/libbytesize-1.1.ebuild (renamed from dev-libs/libbytesize/libbytesize-0.10.ebuild)9
-rw-r--r--dev-libs/protobuf/protobuf-3.4.1.ebuild12
-rw-r--r--media-libs/libraw/Manifest6
-rw-r--r--media-libs/libraw/libraw-0.18.5.ebuild (renamed from media-libs/libraw/libraw-0.18.3.ebuild)2
-rw-r--r--sci-biology/goby/goby-1.9.7.3-r1.ebuild2
-rw-r--r--sci-biology/goby/goby-1.9.8.1-r1.ebuild2
9 files changed, 19 insertions, 20 deletions
diff --git a/dev-java/netty-codec-http/netty-codec-http-4.0.36.ebuild b/dev-java/netty-codec-http/netty-codec-http-4.0.36.ebuild
index 11a2f74b27d6..3753a6e2ebd3 100644
--- a/dev-java/netty-codec-http/netty-codec-http-4.0.36.ebuild
+++ b/dev-java/netty-codec-http/netty-codec-http-4.0.36.ebuild
@@ -41,7 +41,7 @@ DEPEND=">=virtual/jdk-1.7
S="${WORKDIR}/${MY_PN}-${MY_P}.Final/${PN/${MY_PN}-}"
JAVA_SRC_DIR="src/main/java"
-JAVA_GENTOO_CLASSPATH="${MY_PN}-buffer,${MY_PN}-codec,${MY_PN}-common,${MY_PN}-handler,${MY_PN}-transport,jboss-marshalling,jzlib-1.1.3,protobuf"
+JAVA_GENTOO_CLASSPATH="${MY_PN}-buffer,${MY_PN}-codec,${MY_PN}-common,${MY_PN}-handler,${MY_PN}-transport,jboss-marshalling,jzlib-1.1.3,protobuf-java"
src_test() {
cd src/test/java || die
diff --git a/dev-java/netty-codec/netty-codec-4.0.36.ebuild b/dev-java/netty-codec/netty-codec-4.0.36.ebuild
index ae06affab69e..447b8bcc347b 100644
--- a/dev-java/netty-codec/netty-codec-4.0.36.ebuild
+++ b/dev-java/netty-codec/netty-codec-4.0.36.ebuild
@@ -39,7 +39,7 @@ DEPEND=">=virtual/jdk-1.7
S="${WORKDIR}/${MY_PN}-${MY_P}.Final/${PN/${MY_PN}-}"
JAVA_SRC_DIR="src/main/java"
-JAVA_GENTOO_CLASSPATH="${MY_PN}-buffer,${MY_PN}-common,${MY_PN}-transport,jboss-marshalling,jzlib-1.1.3,protobuf"
+JAVA_GENTOO_CLASSPATH="${MY_PN}-buffer,${MY_PN}-common,${MY_PN}-transport,jboss-marshalling,jzlib-1.1.3,protobuf-java"
src_test() {
cd src/test/java || die
diff --git a/dev-libs/libbytesize/Manifest b/dev-libs/libbytesize/Manifest
index ac531a2417ab..63a492e7d977 100644
--- a/dev-libs/libbytesize/Manifest
+++ b/dev-libs/libbytesize/Manifest
@@ -1,2 +1,2 @@
-DIST libbytesize-0.10.tar.gz 67461 SHA256 6178bebe3d966ef477c9507a7b8da5c7fb5ff52e792763270286a42e6b892aee SHA512 26dcca781c70b5fdc0c0ef973ce65db2c4ce4520bb413b2e0137e3c8a0ccef0b0b47f46e50e13035fb74c3bd2a16ab8faad8c4fb843f33419a5e5d70dae73587 WHIRLPOOL c91b63e76a368aff4434cc09f546b1ee2265afa95fa6ef6ad25e6ed3554262361342c60ff7fddcc9887b3ddb53c2d5c6890dd28427e35be4af9c12fdc1dc6d53
DIST libbytesize-0.11.tar.gz 68322 SHA256 3eff9a4b3350420b5e1ecfff523a739049d000b34485e3e1ccf4a4d7685490cb SHA512 3275116a74ead484508da494934062e77d19b50dcd124d7b309137e52a416474099685c39ddc63090d6ed124a667c7fc8c2a7a5844712b33f277703bb52d54ec WHIRLPOOL 717b33b11739747245f74cb6a9b33cbf6cc0e421c5464f253254642e82dfbf55dad26fcf440db3c345dfad7c721c10e0501be409f7b6f8ebcbc6bb0c276687c7
+DIST libbytesize-1.1.tar.gz 70495 SHA256 1d17e8ab347e0496d7976b840c9ce230896674b8dc913cad7a9faa3cea92c193 SHA512 3d376dd0f9a10974f2392e3417e8e99ac57313be3ec945eeb7c84f72ddd51a5f29b61c7268c8c870dbe941eebf8d9027f8f5b7e0140790510bd8fb6b2c8db35b WHIRLPOOL f0da803649188ad631f10948ab4795d19771ee88d74e7398b78c81c34f966584ef97a542d0d85d7dd8269dd001107bd5731fb38fb3949055dd11286b7814fd38
diff --git a/dev-libs/libbytesize/libbytesize-0.10.ebuild b/dev-libs/libbytesize/libbytesize-1.1.ebuild
index 9a089877335e..61b601fbd627 100644
--- a/dev-libs/libbytesize/libbytesize-0.10.ebuild
+++ b/dev-libs/libbytesize/libbytesize-1.1.ebuild
@@ -15,14 +15,14 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="doc test"
-CDEPEND="
+RDEPEND="
${PYTHON_DEPS}
dev-libs/gmp:0=
>=dev-libs/libpcre-8.32
"
DEPEND="
- ${CDEPEND}
+ ${RDEPEND}
sys-devel/gettext
doc? ( dev-util/gtk-doc )
test? (
@@ -31,11 +31,6 @@ DEPEND="
)
"
-RDEPEND="
- ${CDEPEND}
-"
-
-# https://github.com/rhinstaller/libbytesize/issues/27
RESTRICT="test"
pkg_setup() {
diff --git a/dev-libs/protobuf/protobuf-3.4.1.ebuild b/dev-libs/protobuf/protobuf-3.4.1.ebuild
index d4a2ba85c2d1..ab347e7227c1 100644
--- a/dev-libs/protobuf/protobuf-3.4.1.ebuild
+++ b/dev-libs/protobuf/protobuf-3.4.1.ebuild
@@ -53,16 +53,20 @@ multilib_src_configure() {
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
}
+src_compile() {
+ multilib-minimal_src_compile
+
+ if use emacs; then
+ elisp-compile editors/protobuf-mode.el
+ fi
+}
+
multilib_src_compile() {
if tc-is-cross-compiler; then
emake -C "${WORKDIR}/build/src" protoc
fi
default
-
- if use emacs; then
- elisp-compile editors/protobuf-mode.el
- fi
}
multilib_src_test() {
diff --git a/media-libs/libraw/Manifest b/media-libs/libraw/Manifest
index 66119dff1667..f270ad6d8040 100644
--- a/media-libs/libraw/Manifest
+++ b/media-libs/libraw/Manifest
@@ -1,12 +1,12 @@
DIST LibRaw-0.17.2.tar.gz 1472714 SHA256 92b0c42c7666eca9307e5e1f97d6fefc196cf0b7ee089e22880259a76fafd15c SHA512 e27227850b09e291802c089c826778579420a4af3f4b94dddf488bfc7eb84335d7a944445287d5993c5a574c192df5117c022d1b3d0372b3539a4553612988f4 WHIRLPOOL 55ab9980dc789a0f8c08043a93c1004e268ac3e0902f789a808a47f50e9294eb2f3755f71ecc0310e80cdf440aa60d9ed0e389b27d184e81db6f90f144257436
DIST LibRaw-0.18.2.tar.gz 1281674 SHA256 ce366bb38c1144130737eb16e919038937b4dc1ab165179a225d5e847af2abc6 SHA512 87d3e5a0ecf7fc7c35a32f3963d108553b2d21a89aa75e4f2d9fab939aa14aa267ccf2a29e75e12d613c39798eb222b55da80371e699e913a58a7ae0fd47a2bc WHIRLPOOL 04493eb20169091b1782f5f7d5988c142c612e726f3225c4394779aa4caae678792ac080fcf43bf25bffa698b1ab7353a4eaf226d15125db2254d7b1bc16045b
-DIST LibRaw-0.18.3.tar.gz 1281493 SHA256 446599eb985bd8074ab63709f50fc7e4fcc9eb41fba9aa6fb8e8bf5fcbdf66a5 SHA512 4853f19562c94fe6da86a4def0b3c1e4d38cc0882641da1f27acb0940f416d767be0a847547b5625ea6481a977a8f06af987cdc6fa5ee9ea07021506ca28d87a WHIRLPOOL 882ae06a282b9b6c194dfe17648a16ee9d9c8f299780fe230f2c3fe03ec0b27dd2a54c2548bb16aaf33f08c68878919e879346290b677a1264a1f2c7508347d4
DIST LibRaw-0.18.4.tar.gz 1281104 SHA256 eaf4931b46e65861e88bbe704ccf370381e94d63e9a898b889ded4e0cb3b0c97 SHA512 e71db23a70f0cda745ae862f4cb6a0c51c968e4c7399f28e86de8beb894526fa76cd337c1406e2eaee3f287f15e8912d1a0f7217493c6444a491ca3329f63776 WHIRLPOOL c7bfecfe51280088b8be35a226e765b2a3f810d120150a74326b4ee9662f10b170fa8cca7b4ef7191431b7b08df4f83df5dbe6da1811915405b4d2d72b988e38
+DIST LibRaw-0.18.5.tar.gz 1280046 SHA256 fa2a7d14d9dfaf6b368f958a76d79266b3f58c2bc367bebab56e11baa94da178 SHA512 751a1c54507b7408d0d36c3f1fb0e31928f5ae540fae42eb2b57d8fcebcd44134dc452a4f3838dd31dbc8fb3978a6cac6129429a3350f8be5dc44146309aff81 WHIRLPOOL b35227120e140abbd59b6587296fc81e7737a32cce82b8d4b2c240d448c786040302d1737c614168b5e8f797a760a396cfc353929afa7aba48af3f3e70cd1b8d
DIST LibRaw-demosaic-pack-GPL2-0.17.2.tar.gz 31190 SHA256 a2e5e9cc04fa8f3e94070110dce8a06aa3b0b2f573ed99c5fc3e327d15f014b7 SHA512 634fcd62433bc9a9aebccd113ef95a070609edee2520b7a609bab1b9612cc472b77295deb84e43ffcf002a2cdb57bb92a39d1e4b1bb8fed77a221b370074edea WHIRLPOOL a10d7921a9f20b088e2e0d773315bd00b2c4105c1a9e6890386fe53a08af2e698441e6abf9ab445099962e500502618fb687974126a4345422a759fb174e591c
DIST LibRaw-demosaic-pack-GPL2-0.18.2.tar.gz 31777 SHA256 f467689182728240c6358c1b890e9fe4ee08667c74433f6bd6a4710e3ae2aab6 SHA512 d979671769bb9a4695ace5c5478d6fefea2d9efd1ed30b25e3d6e3e517b86b551cbe9df7db75f735b130e1baf98b5d3485478f59379265fc4376c195ac6c1125 WHIRLPOOL e03fd53af54e0b86811273c1900764fbad5be7d259445031f9b178bc82aba53880a0f26916b86fbe0e8b12fe4eba78f594a7abbeaa1d77fa86379cf664f28a38
-DIST LibRaw-demosaic-pack-GPL2-0.18.3.tar.gz 32781 SHA256 112d7234df29335397a41b4d38d226fecbfad03aa592b6a80a5510a9da38a024 SHA512 55b04cf33cc6cc781867fcecfd21f74fbde59ab7ed291e62faf8b24da312b7ac344830d561c6881cbda432d3d0514ef9ad0cb0def727cb3095d2a91aa095bf39 WHIRLPOOL 2a576d8d5483c9bbfb102ae8a71c0c64b1b933abe4d092791aece4608e535c0195254ae9fb518b4d50c23ebae0b047683457d91b4534b5e85eebc8426f8aa8a6
DIST LibRaw-demosaic-pack-GPL2-0.18.4.tar.gz 33129 SHA256 8961b0a90d4b1a5d00a13d9ed2f23e8f2c651b4a68c0470e01ba7668cc98145f SHA512 05bef76530f9237e1d1bfe08014f30de328b68319f88d126aaffa8baf3b89615d160bac36a6ad2cc38cab0faeb8c4bf86714dd568e7f01cfd1ee2513ac175a5d WHIRLPOOL 70fd4d7d5503d4edf985be7afe0635d8f54e3680a6be0384c0036480001d2fcb32cd6faa02f6219a5c28192448b2ea50bffae324b83d77509712887d7f02ccf4
+DIST LibRaw-demosaic-pack-GPL2-0.18.5.tar.gz 30449 SHA256 2ae7923868c3e927eee72cf2e4d91384560b7cfe76a386ecf319c069d343c674 SHA512 1599695394717558e61844e32d76bf653741592d81691c9f55bfb72c8c5d485bce4eab3fc0eefd37640254c431bd78706fe04ca547e42566dda789f0b6559af5 WHIRLPOOL 880f95a95d61b9832ef0a5115aeb9d3ca27dd8de893265b86073fc30e22224a3fea125fb0d9a26d9af01cfb1a8aa4d21a93a5574599ffddf2d1b69e9349fa093
DIST LibRaw-demosaic-pack-GPL3-0.17.2.tar.gz 38908 SHA256 b00cd0f54851bd3c8a66be4cacbf049e4508f1bac8ff85cb4528d8979739ed36 SHA512 fda6e22a8e4eb5614c6878ed77990f8f558ea54b9ec63ca77fb279543efa334c60d0fc48c1c5029c17216a1f7ed0e84db73675bd9d7308f869d11218184e19ad WHIRLPOOL 545d5fc29ccc01f862868675b12ea5dab8fad5bd59781e744344fee62d446697529cc9ac169f2167d81feea8dbbb56f57cb4883d02e4e472fa81e992f3a7f73f
DIST LibRaw-demosaic-pack-GPL3-0.18.2.tar.gz 39290 SHA256 01080bc2448de87339f086229319c9e1cca97ac0621416feb537b96f0dba4a57 SHA512 0fcfd89ea7607e9a5c0594f09ec49ae3be749efeaa4a30a05d45926610609ef23ff416075fae153efe20b62ab020c0433525761025613d585acffbcd7c663d51 WHIRLPOOL 8be882be0ca70a2b6885397442d3e656553ae79946f39cf878a048f447e60a0d47d10ee219ab7c59c01b1c7997b392a942fe1ed1ac572a115e440e6a1d3f0b1b
-DIST LibRaw-demosaic-pack-GPL3-0.18.3.tar.gz 39255 SHA256 60676537f19dca11babe4dd2930f9f6fd163de3a15ac660896a07123c0acb638 SHA512 24c4e3501fdf704079e1ab618fab77bdab10d23f1c675a37e33f25c3d872f8a934538d3642c382f7b0d18d9aba001e7931e3663f20e78110935e1a9fd8851df4 WHIRLPOOL a154b1b6afd882222c4f3bf67ffbc4b9643e050f529b9bf514dc24ce568740f6a469abc2192c5f0575d378cee76e9ca5c250d052e1c24e3c28d172769d7b48ae
DIST LibRaw-demosaic-pack-GPL3-0.18.4.tar.gz 38622 SHA256 9aa8ad60581b9c6a0ed81d96f897804cac832c7eeb087a38ca61fcd54838966c SHA512 158d951d0e1c35f1ebdde8849f0b51e23332c8b5b13a4b0ab0677a3d4a1682afd6e7c5dec4194072b4588699bf49a023591fa1b05d2a8f4c54cd1a44e65e3ad9 WHIRLPOOL da402afa54a6b3a10f17a3e2ea92475433a8baeb02c9be95d107fbb740f8e3448cba7183ef161ef04613f815af9c97196a7d9d3b14cca643ffabf329df7d9de5
+DIST LibRaw-demosaic-pack-GPL3-0.18.5.tar.gz 38899 SHA256 b0ec998c4884cedd86a0627481a18144f0024a35c7a6fa5ae836182c16975c2b SHA512 c00193b64673e093c33a9d1316448eea4eb7e2b274d5d3bd39cef02b7269e56ce72f9b47831039e00b2feb8344b5266f9c03b5f11212d520809674db253cb028 WHIRLPOOL 78dfc95e23c4570f604262911747f751177e35d489875c1c1de21afeead4f902774e75387fc37b49a7800012fdb8bb872340faf15607e2b206677bb8fd236c6c
diff --git a/media-libs/libraw/libraw-0.18.3.ebuild b/media-libs/libraw/libraw-0.18.5.ebuild
index ed8d0af65b4b..e66ec29b75cb 100644
--- a/media-libs/libraw/libraw-0.18.3.ebuild
+++ b/media-libs/libraw/libraw-0.18.5.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz
LICENSE="LGPL-2.1 CDDL demosaic? ( GPL-2 GPL-3 )"
SLOT="0/16" # subslot = libraw soname version
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="demosaic examples jpeg jpeg2k +lcms openmp"
RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
diff --git a/sci-biology/goby/goby-1.9.7.3-r1.ebuild b/sci-biology/goby/goby-1.9.7.3-r1.ebuild
index bcf1dcc83090..9cab1b56d54e 100644
--- a/sci-biology/goby/goby-1.9.7.3-r1.ebuild
+++ b/sci-biology/goby/goby-1.9.7.3-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=4
ESVN_REPO_URI="https://pbtech-vc.med.cornell.edu/public/svn/icb/trunk/goby"
-EANT_GENTOO_CLASSPATH="commons-logging,commons-lang-2.1,commons-io-1,protobuf,fastutil,log4j,jsap,commons-configuration,commons-math-2"
+EANT_GENTOO_CLASSPATH="commons-logging,commons-lang-2.1,commons-io-1,protobuf-java,fastutil,log4j,jsap,commons-configuration,commons-math-2"
EANT_GENTOO_CLASSPATH_EXTRA="lib/icb-utils.jar:lib/edu.mssm.crover.cli.jar:lib/JRI.jar:lib/dsiutils-1.0.12.jar"
JAVA_ANT_REWRITE_CLASSPATH="true"
diff --git a/sci-biology/goby/goby-1.9.8.1-r1.ebuild b/sci-biology/goby/goby-1.9.8.1-r1.ebuild
index bcf1dcc83090..9cab1b56d54e 100644
--- a/sci-biology/goby/goby-1.9.8.1-r1.ebuild
+++ b/sci-biology/goby/goby-1.9.8.1-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=4
ESVN_REPO_URI="https://pbtech-vc.med.cornell.edu/public/svn/icb/trunk/goby"
-EANT_GENTOO_CLASSPATH="commons-logging,commons-lang-2.1,commons-io-1,protobuf,fastutil,log4j,jsap,commons-configuration,commons-math-2"
+EANT_GENTOO_CLASSPATH="commons-logging,commons-lang-2.1,commons-io-1,protobuf-java,fastutil,log4j,jsap,commons-configuration,commons-math-2"
EANT_GENTOO_CLASSPATH_EXTRA="lib/icb-utils.jar:lib/edu.mssm.crover.cli.jar:lib/JRI.jar:lib/dsiutils-1.0.12.jar"
JAVA_ANT_REWRITE_CLASSPATH="true"