diff --git a/app-crypt/libykneomgr/Manifest b/app-crypt/libykneomgr/Manifest index 847dd4fd8b90..329d29d04646 100644 --- a/app-crypt/libykneomgr/Manifest +++ b/app-crypt/libykneomgr/Manifest @@ -1,2 +1,3 @@ DIST libykneomgr-0.1.6.tar.gz 633881 SHA256 7c0ddf2b5397e2d335da5d727c55d0be6a9ab43263c60edcac1ffe45b526ca95 SHA512 deb8deafa3c748bb888309d9d2d62f3657cd6d9d103ceee738abbc47a8e4466535e9641f104f5628657ec8924306b8d9d0a90cd2485dd5ad46dd2d8ee932fab4 WHIRLPOOL 3c9f1c53e411633b74b56eb991155a3ffbe2453a336b10b00a3e69a55f4c30b4df4ddfb50a7252ea058a76211d0683d029428bb24c839586b0277bde7297c582 DIST libykneomgr-0.1.7.tar.gz 625509 SHA256 dcce20274976e29b63380633928e1e75e05544430fca37082465c9075ea29f5a SHA512 b97d0de0050a4dea55963403a8710fe94dbef05041ec4fc42c4f2e7fc7ebd64b94aeb8d8c0231ad7828840efff28e6bd5b392b25d6bcafbeaab469a6e52e5163 WHIRLPOOL 6af69069963859580fa03fd41e794d01895aaaefae3b87ae8a60575dfb82648eea5efb5970ac95608112969a174dbd75a7a2c8dade4c8ebffbed866ca6506fb6 +DIST libykneomgr-0.1.8.tar.gz 626257 SHA256 2749ef299a1772818e63c0ff5276f18f1694f9de2137176a087902403e5df889 SHA512 536db3a81b74d24e727cc09c5bb898723b602e6c55e249745ced59d5f9416673fdbecd80bb7ebc7031be349092c8fb4f5623c8f6972ab870ec1f50ac1bc2f795 WHIRLPOOL 8b3b6304910e0a50fe54c658fe6fa00e86e4add41a966cc0a5941410e5fa6bfba2219f86f102c1cfa170165880c9b80dd599591f45e06d61607505f8cc5b752c diff --git a/app-crypt/libykneomgr/libykneomgr-0.1.8.ebuild b/app-crypt/libykneomgr/libykneomgr-0.1.8.ebuild new file mode 100644 index 000000000000..e6ffd1d0de4a --- /dev/null +++ b/app-crypt/libykneomgr/libykneomgr-0.1.8.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit autotools-utils udev + +DESCRIPTION="YubiKey NEO CCID Manager C Library" +HOMEPAGE="https://developers.yubico.com/libykneomgr/" +SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz" + +LICENSE="LGPL-3" +SLOT="0" +KEYWORDS="~amd64" +IUSE="kernel_linux" + +RDEPEND="sys-apps/pcsc-lite + dev-libs/libzip" +DEPEND="${RDEPEND} + virtual/pkgconfig" +RDEPEND="${RDEPEND} + >=app-crypt/ccid-1.4.18[usb]" + +src_configure() { + local myeconfargs=( + --with-backend=pcsc + --disable-static + ) + + autotools-utils_src_configure +} diff --git a/app-crypt/xca/xca-1.3.1.ebuild b/app-crypt/xca/xca-1.3.1.ebuild index f09f3dfef540..1e7a29b9cc80 100644 --- a/app-crypt/xca/xca-1.3.1.ebuild +++ b/app-crypt/xca/xca-1.3.1.ebuild @@ -4,7 +4,7 @@ EAPI="5" -inherit eutils toolchain-funcs +inherit autotools eutils toolchain-funcs DESCRIPTION="A GUI to OpenSSL, RSA public keys, certificates, signing requests and revokation lists" HOMEPAGE="http://xca.sourceforge.net" @@ -22,6 +22,7 @@ DEPEND="${RDEPEND}" src_prepare() { epatch "${FILESDIR}"/${PN}-1.0.0-desktop.patch epatch "${FILESDIR}"/${P}-build.patch + AT_M4DIR="m4" eautoreconf } src_configure() { diff --git a/dev-java/commons-attributes/commons-attributes-2.2-r2.ebuild b/dev-java/commons-attributes/commons-attributes-2.2-r2.ebuild index 0860a7b64641..adc43c0d6863 100644 --- a/dev-java/commons-attributes/commons-attributes-2.2-r2.ebuild +++ b/dev-java/commons-attributes/commons-attributes-2.2-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -14,18 +14,18 @@ SRC_URI="mirror://apache/commons/attributes/source/${P}-src.tar.gz" LICENSE="Apache-2.0" SLOT="2" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" -COMMON_DEP="dev-java/ant-core:0 +CDEPEND="dev-java/ant-core:0 dev-java/gjdoc:0 dev-java/qdox:1.6 dev-java/xjavadoc:0" -DEPEND=">=virtual/jdk-1.4 - ${COMMON_DEP}" +DEPEND=">=virtual/jdk-1.6 + ${CDEPEND}" -RDEPEND=">=virtual/jre-1.4 - ${COMMON_DEP}" +RDEPEND=">=virtual/jre-1.6 + ${CDEPEND}" JAVA_ANT_REWRITE_CLASSPATH="true" EANT_GENTOO_CLASSPATH="ant-core,gjdoc,qdox-1.6" diff --git a/dev-java/commons-chain/commons-chain-1.2.ebuild b/dev-java/commons-chain/commons-chain-1.2.ebuild index 39cccd08e661..4e20ef49d0c8 100644 --- a/dev-java/commons-chain/commons-chain-1.2.ebuild +++ b/dev-java/commons-chain/commons-chain-1.2.ebuild @@ -14,11 +14,11 @@ SRC_URI="mirror://apache/commons/chain/source/${MY_P}.zip" LICENSE="Apache-2.0" SLOT="1.2" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" -# Too many missing imports from javax.servlet.* which cause the +# Too many missing imports from javax.servlet.* which causes the # "compile-tests" target to fail compiling. -# I gave up on it after wasting nearly half a day. +# I gave up on them after wasting nearly half a day. RESTRICT="test" IUSE="" diff --git a/dev-java/commons-compress/Manifest b/dev-java/commons-compress/Manifest index 99045263e539..3e5e50883991 100644 --- a/dev-java/commons-compress/Manifest +++ b/dev-java/commons-compress/Manifest @@ -1,2 +1 @@ -DIST commons-compress-1.4.1-src.tar.gz 3228776 SHA256 b4f34aa03df917b785479e147381eea86c5c17e9067ddf8c27301ff6cd0aa91c SHA512 e1d327f084a79924938698ae16fa6edaaa73072b083109bbd8ccaa636268c05c387e7c2117b5df8f6b91b143495add9cc7da17c1bd3c989f91c910a9d68f6bdb WHIRLPOOL 50565e7342fa363814ed2f347d1daa1ee59dd28cefcd9e494850edcf47899b8684312996dd60b90236a4f2aacce8a920ace37cca5d1d22ad9f63f6696c8e7452 DIST commons-compress-1.8.1-src.tar.gz 8476056 SHA256 aa1221643331d9de5c8155b032c7fde23fc8cf3d962155092de89c44d4978412 SHA512 4e4f9633cc3c470970a8da41344a819ff63430a46e219e93896dbe2374738349f78942cff93ad8d348599cfc2dd7d014ae4ff3b09d76a924bb11ca1c4a2c05ea WHIRLPOOL 2d7f3230f47186a72b4b31efd10c5dfd68488d263e26d97b6e715b2b2eab3e22ae3e5946d232ca014aa2a3d14f3abf87ce97bf2e70c7c06788c4093df4156aef diff --git a/dev-java/commons-compress/commons-compress-1.4.1.ebuild b/dev-java/commons-compress/commons-compress-1.4.1.ebuild deleted file mode 100644 index 12176cdfe021..000000000000 --- a/dev-java/commons-compress/commons-compress-1.4.1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -JAVA_PKG_IUSE="doc source test" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Commons Compress defines an API for working with ar, cpio, tar, zip, gzip and bzip2 files" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -COMMON_DEPEND="dev-java/xz-java" - -RDEPEND=">=virtual/jre-1.5 - ${COMMON_DEPEND}" -DEPEND=">=virtual/jdk-1.5 - ${COMMON_DEPEND} - test? ( dev-java/junit:4 - dev-java/hamcrest-core - dev-java/ant-junit:0 )" - -S="${WORKDIR}/${P}-src" - -JAVA_ANT_BSFIX_EXTRA_ARGS="--maven-cleaning" -EANT_GENTOO_CLASSPATH="xz-java" -EANT_BUILD_TARGET="compile package" -EANT_TEST_GENTOO_CLASSPATH="junit-4 hamcrest-core xz-java" - -java_prepare() { - cp "${FILESDIR}"/build.xml . || die "Failed to copy build.xml" - - # osgi stuff mvn ant:ant doesn't handle - mkdir -p target/osgi || die "Failed to create target dir" - cp "${FILESDIR}"/MANIFEST.MF target/osgi/ || die "Failed to copy manifest" - - if ! use test; then - find -name "*.jar" -delete || die "Failed to remove test resources" - fi -} - -src_test() { - EANT_TEST_TARGET="compile-tests test" - java-pkg-2_src_test -} - -src_install() { - java-pkg_newjar target/${PN}-1.1.jar - use doc && java-pkg_dojavadoc target/site/apidocs - use source && java-pkg_dosrc src/main/java/* -} diff --git a/dev-java/commons-compress/commons-compress-1.8.1.ebuild b/dev-java/commons-compress/commons-compress-1.8.1.ebuild deleted file mode 100644 index d52a6db08966..000000000000 --- a/dev-java/commons-compress/commons-compress-1.8.1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -JAVA_PKG_IUSE="doc source test" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Commons Compress defines an API for working with ar, cpio, tar, zip, gzip and bzip2 files" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -COMMON_DEPEND="dev-java/xz-java" - -RDEPEND=">=virtual/jre-1.5 - ${COMMON_DEPEND}" -DEPEND=">=virtual/jdk-1.5 - ${COMMON_DEPEND} - test? ( dev-java/junit:4 - dev-java/hamcrest-core - dev-java/ant-junit:0 )" - -S="${WORKDIR}/${P}-src" - -JAVA_ANT_BSFIX_EXTRA_ARGS="--maven-cleaning" -EANT_GENTOO_CLASSPATH="xz-java" -EANT_BUILD_TARGET="compile package" -EANT_TEST_GENTOO_CLASSPATH="junit-4 hamcrest-core xz-java" - -java_prepare() { - cp "${FILESDIR}"/build.xml . || die "Failed to copy build.xml" - - # osgi stuff mvn ant:ant doesn't handle - mkdir -p target/osgi || die "Failed to create target dir" - cp "${FILESDIR}"/MANIFEST.MF target/osgi/ || die "Failed to copy manifest" - - if ! use test; then - find -name "*.jar" -delete || die "Failed to remove test resources" - fi -} - -src_test() { - EANT_TEST_TARGET="compile-tests test" - java-pkg-2_src_test -} - -src_install() { - java-pkg_newjar target/${PN}-1.1.jar - use doc && java-pkg_dojavadoc target/site/apidocs - use source && java-pkg_dosrc src/main/java/* -} diff --git a/dev-java/portletapi/portletapi-2.0.ebuild b/dev-java/portletapi/portletapi-2.0.ebuild index e5546ac9eef8..31306de50bc2 100644 --- a/dev-java/portletapi/portletapi-2.0.ebuild +++ b/dev-java/portletapi/portletapi-2.0.ebuild @@ -15,7 +15,7 @@ SRC_URI="http://mirrors.ibiblio.org/maven2/javax/portlet/${MY_PN}/${PV}/${MY_P}- LICENSE="Apache-2.0" SLOT="2.0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ppc ppc64 x86" IUSE="" diff --git a/dev-libs/openssl/openssl-0.9.8z_p7.ebuild b/dev-libs/openssl/openssl-0.9.8z_p7.ebuild index d3807f00a998..817c1c870f5a 100644 --- a/dev-libs/openssl/openssl-0.9.8z_p7.ebuild +++ b/dev-libs/openssl/openssl-0.9.8z_p7.ebuild @@ -31,9 +31,11 @@ RDEPEND="gmp? ( >=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}] ) ) !=dev-libs/openssl-0.9.8*:0" DEPEND="${RDEPEND} - sys-apps/diffutils >=dev-lang/perl-5 - test? ( sys-devel/bc )" + test? ( + sys-apps/diffutils + sys-devel/bc + )" # Do not install any docs DOCS=() diff --git a/dev-libs/openssl/openssl-1.0.2d-r2.ebuild b/dev-libs/openssl/openssl-1.0.2d-r2.ebuild index 7d2d03cc5174..e45dd2463b89 100644 --- a/dev-libs/openssl/openssl-1.0.2d-r2.ebuild +++ b/dev-libs/openssl/openssl-1.0.2d-r2.ebuild @@ -31,10 +31,12 @@ RDEPEND=">=app-misc/c_rehash-1.7-r1 !=dev-python/cython-0.22' ; then - epatch "${FILESDIR}/cython-0.22.patch" - fi - distutils-r1_python_prepare_all -} - -python_install_all() { - use doc && DOCS=( doc/sources/. ) - use examples && EXAMPLES=( examples ) - distutils-r1_python_install_all -} diff --git a/dev-python/Kivy/Kivy-1.9.0.ebuild b/dev-python/Kivy/Kivy-1.9.0-r1.ebuild similarity index 96% rename from dev-python/Kivy/Kivy-1.9.0.ebuild rename to dev-python/Kivy/Kivy-1.9.0-r1.ebuild index 9dbec84d0a6d..8bd7347ca967 100644 --- a/dev-python/Kivy/Kivy-1.9.0.ebuild +++ b/dev-python/Kivy/Kivy-1.9.0-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="cairo camera doc examples garden gstreamer spell" RDEPEND=" @@ -29,6 +29,7 @@ RDEPEND=" DEPEND="${RDEPEND} <=dev-python/cython-0.22[${PYTHON_USEDEP}] dev-python/setuptools[${PYTHON_USEDEP}] + media-libs/mesa " PATCHES=( "${FILESDIR}"/${P}-cython-0.22-backport.patch ) diff --git a/dev-python/Kivy/Manifest b/dev-python/Kivy/Manifest index f81ab10cd867..7e5371c2a891 100644 --- a/dev-python/Kivy/Manifest +++ b/dev-python/Kivy/Manifest @@ -1,2 +1 @@ -DIST Kivy-1.8.0.tar.gz 14655888 SHA256 1bb5add88132c902ed746e7624034ecaab49e61f3fbbfde231604e887e6fb324 SHA512 e7057b008cceec9513961ddc3d4aaef2aa1a10de9c2de09ad82bd90ca88300047374e5f8c982cb018712fb0465c03208108c3110887ef383c00a45ee9e5bc81d WHIRLPOOL a6530edebcae34aede981c2f0db37a26a9378e148a073dc1396096b4db04ebdef0f6d96de4222383a5e2d84858bdf10383611751f9bf5ae625eafc67d1cf702f DIST Kivy-1.9.0.tar.gz 16178808 SHA256 b828617f858963f7873f5c81bb8824ca1dfa265e7811fce03599e2ba7200ffa0 SHA512 e0efc27f8ae070f5748570ee9224220791d32e931bbaf0bad5ddee894cf1d0f9ded5eebcc54d3b666491edaab0316923311f5e0cc7b1e46929d87ea3bec87f21 WHIRLPOOL c57c696752c88d3c8643e126180aa00b864df45bad0de4e6456143fd0f1486085a258a787ec2e4017b982004dd5a1212b11dbcb352f1f72b77591fa5fd9c934e diff --git a/dev-python/Kivy/files/cython-0.22.patch b/dev-python/Kivy/files/cython-0.22.patch deleted file mode 100644 index 9b125f9ad648..000000000000 --- a/dev-python/Kivy/files/cython-0.22.patch +++ /dev/null @@ -1,139 +0,0 @@ ---- kivy/graphics.orig/shader.pyx 2015-02-19 07:27:13.062070969 +0100 -+++ kivy/graphics/shader.pyx 2015-02-19 07:27:22.838737743 +0100 -@@ -221,13 +221,13 @@ - ''' - glUseProgram(0) - -- cdef void set_uniform(self, str name, value): -+ cdef void set_uniform(self, str name, value) except *: - if name in self.uniform_values and self.uniform_values[name] == value: - return - self.uniform_values[name] = value - self.upload_uniform(name, value) - -- cdef void upload_uniform(self, str name, value): -+ cdef void upload_uniform(self, str name, value) except *: - '''Pass a uniform variable to the shader. - ''' - cdef long vec_size, index, x, y -@@ -412,7 +412,7 @@ - mat[x] = value.mat[x] - glUniformMatrix4fv(loc, 1, False, mat) - -- cdef int get_uniform_loc(self, str name): -+ cdef int get_uniform_loc(self, str name) except *: - cdef bytes c_name = name.encode('utf-8') - cdef int loc = glGetUniformLocation(self.program, c_name) - self.uniform_locations[name] = loc -@@ -453,11 +453,11 @@ - # save for the next run. - self._current_vertex_format = vertex_format - -- cdef void build(self): -+ cdef void build(self) except *: - self.build_vertex() - self.build_fragment() - -- cdef void build_vertex(self, int link=1): -+ cdef void build_vertex(self, int link=1) except *: - if self.vertex_shader is not None: - glDetachShader(self.program, self.vertex_shader.shader) - self.vertex_shader = None -@@ -467,7 +467,7 @@ - if link: - self.link_program() - -- cdef void build_fragment(self, int link=1): -+ cdef void build_fragment(self, int link=1) except *: - if self.fragment_shader is not None: - glDetachShader(self.program, self.fragment_shader.shader) - self.fragment_shader = None -@@ -477,7 +477,7 @@ - if link: - self.link_program() - -- cdef void link_program(self): -+ cdef void link_program(self) except *: - if self.vertex_shader is None or self.fragment_shader is None: - return - ---- kivy/graphics.orig/instructions.pyx 2015-02-19 07:27:13.062070969 +0100 -+++ kivy/graphics/instructions.pyx 2014-01-20 03:49:50.000000000 +0100 -@@ -233,15 +233,15 @@ - if self.context_pop: - context.pop_states(self.context_pop) - -- cdef void set_state(self, str name, value): -+ cdef void set_state(self, str name, value) except *: - self.context_state[name] = value - self.flag_update() - -- cdef void push_state(self, str name): -+ cdef void push_state(self, str name) except *: - self.context_push.append(name) - self.flag_update() - -- cdef void pop_state(self, str name): -+ cdef void pop_state(self, str name) except *: - self.context_pop.append(name) - self.flag_update() - -@@ -764,29 +764,29 @@ - cdef get_state(self, str name): - return self.state_stacks[name][-1] - -- cdef void set_states(self, dict states): -+ cdef void set_states(self, dict states) except *: - cdef str name - for name, value in states.iteritems(): - self.set_state(name, value) - -- cdef void push_state(self, str name): -+ cdef void push_state(self, str name) except *: - stack = self.state_stacks[name] - stack.append(stack[-1]) - self.flag_update() - -- cdef void push_states(self, list names): -+ cdef void push_states(self, list names) except *: - cdef str name - for name in names: - self.push_state(name) - -- cdef void pop_state(self, str name): -+ cdef void pop_state(self, str name) except *: - stack = self.state_stacks[name] - oldvalue = stack.pop() - if oldvalue != stack[-1]: - self.set_state(name, stack[-1]) - self.flag_update() - -- cdef void pop_states(self, list names): -+ cdef void pop_states(self, list names) except *: - cdef str name - for name in names: - self.pop_state(name) -@@ -806,10 +806,10 @@ - texture.bind() - self.flag_update() - -- cdef void enter(self): -+ cdef void enter(self) except *: - self._shader.use() - -- cdef void leave(self): -+ cdef void leave(self) except *: - self._shader.stop() - - cdef void apply(self): ---- kivy/graphics.orig/instructions.pxd 2015-02-19 07:44:16.315415541 +0100 -+++ kivy/graphics/instructions.pxd 2014-01-20 03:49:50.000000000 +0100 -@@ -115,7 +115,7 @@ - cdef void pop_states(self, list names) except * - cdef void enter(self) except * - cdef void leave(self) except * -- cdef void apply(self) except * -+ cdef void apply(self) - cpdef draw(self) - cdef void reload(self) - diff --git a/dev-python/Kivy/files/cython-fixes.patch b/dev-python/Kivy/files/cython-fixes.patch deleted file mode 100644 index b9eca4c5d5da..000000000000 --- a/dev-python/Kivy/files/cython-fixes.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- kivy/lib/gstplayer/_gstplayer.pyx.orig 2014-01-29 17:45:32.000000000 +0100 -+++ kivy/lib/gstplayer/_gstplayer.pyx 2015-01-01 21:24:55.480191418 +0100 -@@ -207,7 +207,7 @@ - self.eos_cb() - - def load(self): -- cdef char *c_uri -+ cdef bytes py_uri - - # if already loaded before, clean everything. - if self.pipeline != NULL: -@@ -256,8 +256,8 @@ - - # configure playbin - g_object_set_int(self.pipeline, 'async-handling', 1) -- c_uri = self.uri.encode('utf-8') -- g_object_set_void(self.playbin, 'uri', c_uri) -+ py_uri = self.uri.encode('utf-8') -+ g_object_set_void(self.playbin, 'uri', py_uri) - - # attach the callback - # NOTE no need to create a weakref here, as we manage to grab/release ---- kivy/graphics/shader.pyx.orig 2014-01-20 03:49:50.000000000 +0100 -+++ kivy/graphics/shader.pyx 2015-01-01 21:25:01.446858150 +0100 -@@ -421,6 +421,7 @@ - cdef void bind_vertex_format(self, VertexFormat vertex_format): - cdef unsigned int i - cdef vertex_attr_t *attr -+ cdef bytes name - - # if the current vertex format used in the shader is the current one, do - # nothing. -@@ -445,7 +446,8 @@ - attr = &vertex_format.vattr[i] - if attr.per_vertex == 0: - continue -- attr.index = glGetAttribLocation(self.program, attr.name) -+ name = attr.name -+ attr.index = glGetAttribLocation(self.program, name) - glEnableVertexAttribArray(attr.index) - - # save for the next run. diff --git a/dev-python/kivy-garden/kivy-garden-0.1.1.ebuild b/dev-python/kivy-garden/kivy-garden-0.1.1.ebuild index 5fb696ac8856..7fcef402cf9f 100644 --- a/dev-python/kivy-garden/kivy-garden-0.1.1.ebuild +++ b/dev-python/kivy-garden/kivy-garden-0.1.1.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" DEPEND=" diff --git a/dev-util/debhelper/Manifest b/dev-util/debhelper/Manifest index 7e66f1ee00d7..a31708a113b6 100644 --- a/dev-util/debhelper/Manifest +++ b/dev-util/debhelper/Manifest @@ -4,3 +4,4 @@ DIST debhelper_9.20150507.tar.xz 314408 SHA256 f3b51b3c1ad87cd936d4c443f1cebf8f1 DIST debhelper_9.20150628.tar.xz 317804 SHA256 8fb59c2a03fa9f6061db8091e7ecaf68c5680495eec05d6c145e3f782b09d68f SHA512 bde93266e475c3ac7dd8cbf5ee0d2c435593eadbc0f33d1389f2705f7debc36b4da165ae65cfd202a1c871fd708cda1d1c57763bdad04748a1bbdab516b2905a WHIRLPOOL 4a56790c1a1629e83b6fd164cb74d9edace02318334bc968acc74f421db98b343bbd32dce56fc15a5ca4a4c7b4364bfea9bf1213864c2f3a8238dbc43ee2a33f DIST debhelper_9.20150811.tar.xz 319992 SHA256 dc96fb0e8c34b0f239482088e85261bd8d858b0e5154990b52879893215d6d73 SHA512 37754b0b9fe8e73a9ec3ccbce972d3fddc8d63d11dafb90e6a3ba68a6e966ebab78e1ee564f80dc36b017ac4501b13efba66ccb32309ca040f753c2ec541ba49 WHIRLPOOL 9ed1ac69c48b4002deab5f412f086634ade1a30f8d9932d22ffa5fb93500c0fa1e15c5dd1b4c14b2c2c1ef5bee55434fe9922a19348bfa5da4c54179a1c046c2 DIST debhelper_9.20151004.tar.xz 325348 SHA256 e8c32712db58ac0764e8c83a324a7a519a58a33a6c9ba86f1ca0ac171213f21f SHA512 15bb0beb1fa37b30ededffe160b660fc415dd8935db2f7f548128090d7719d2004fd721abefbd0c7f88b18edd476124ebd1f759f6ead9c341d6c1ebfe5ad0121 WHIRLPOOL 961e7150f28dfc11e4f9582bf92ded6dcd69c808b5179c4e97f36d17178414bb68d40c69fb38fef007cfa03933cf888bb1c4a5a55e15bf0bd9306c03ed258970 +DIST debhelper_9.20151005.tar.xz 325420 SHA256 232776ecf0e7955ea4154edc92eb6450f5d57343c7da0de1a698077efaa50958 SHA512 d5e967a0bfa5c7cdb89099ef26ab566cea49ec0e1dce9cea1f626f32ac2f1b39aa2fa85adfa7acb6473322f4796cbfa1e7dfaff860a116a13d8a06db647a1f9c WHIRLPOOL 002ff3786e6ed27548c32a1bda7750ac5ef018d2002b24db1321c0ece074250edd0d3f8c857d8183f24ddae9c59c1243c42169f323c314b1df47653371caa6a0 diff --git a/dev-util/debhelper/debhelper-9.20151005.ebuild b/dev-util/debhelper/debhelper-9.20151005.ebuild new file mode 100644 index 000000000000..9d5f19551da6 --- /dev/null +++ b/dev-util/debhelper/debhelper-9.20151005.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils toolchain-funcs + +DESCRIPTION="Collection of programs that can be used to automate common tasks in debian/rules" +HOMEPAGE="http://packages.qa.debian.org/d/debhelper.html http://joeyh.name/code/debhelper/" +SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux" +IUSE="test" +DH_LINGUAS=( de es fr ) +IUSE+=" ${DH_LINGUAS[@]/#/linguas_}" + +NLS_DEPEND=$( + printf "linguas_%s? ( >=app-text/po4a-0.24 )\n" ${DH_LINGUAS[@]} +) + +RDEPEND=" + >=dev-lang/perl-5.10:= + >=app-arch/dpkg-1.17 + dev-perl/TimeDate + virtual/perl-Getopt-Long +" +DEPEND="${RDEPEND} + ${NLS_DEPEND} + test? ( dev-perl/Test-Pod ) +" + +S=${WORKDIR}/${PN} + +src_compile() { + tc-export CC + + local LANGS="" USE_NLS=no lingua + for lingua in ${DH_LINGUAS[@]}; do + if use linguas_${lingua}; then + LANGS+=" ${lingua}" + USE_NLS=yes + fi + done + + emake USE_NLS="${USE_NLS}" LANGS="${LANGS}" build +} + +src_install() { + emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install + dodoc doc/* debian/changelog + docinto examples + dodoc examples/* + local lingua + for manfile in *.1 *.7 ; do + for lingua in ${DH_LINGUAS[@]}; do + case ${manfile} in + *.${lingua}.?) + use linguas_${lingua} \ + && cp ${manfile} "${T}"/${manfile/.${lingua}/} \ + && doman -i18n=${lingua} "${T}"/${manfile/.${lingua}/} + ;; + *) + doman ${manfile} + ;; + esac + done + done +} diff --git a/eclass/ant-tasks.eclass b/eclass/ant-tasks.eclass index 0b7293fedf3a..91d3193a2f2d 100644 --- a/eclass/ant-tasks.eclass +++ b/eclass/ant-tasks.eclass @@ -1,8 +1,5 @@ -# Eclass for building dev-java/ant-* packages -# # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License, v2 or later -# Author Vlastimil Babka # $Id$ # @ECLASS: ant-tasks.eclass diff --git a/eclass/gdesklets.eclass b/eclass/gdesklets.eclass index 4b2bb888bfd9..378dd1386cd7 100644 --- a/eclass/gdesklets.eclass +++ b/eclass/gdesklets.eclass @@ -1,5 +1,5 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 or later +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 # $Id$ # @ECLASS: gdesklets.eclass diff --git a/eclass/java-ant-2.eclass b/eclass/java-ant-2.eclass index ea0f3e05fa90..64dca0af538f 100644 --- a/eclass/java-ant-2.eclass +++ b/eclass/java-ant-2.eclass @@ -1,19 +1,5 @@ -# eclass for ant based Java packages -# -# Copyright (c) 2004-2005, Thomas Matthijs -# Copyright (c) 2004-2015, Gentoo Foundation -# Changes: -# May 2007: -# Made bsfix make one pass for all things and add some glocal targets for -# setting up the whole thing. Contributed by kiorky -# (kiorky@cryptelium.net). -# December 2006: -# I pretty much rewrote the logic of the bsfix functions -# and xml-rewrite.py because they were so slow -# Petteri Räty (betelgeuse@gentoo.org) -# -# Licensed under the GNU General Public License, v2 -# +# Copyright 2004-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 # $Id$ # @ECLASS: java-ant-2.eclass diff --git a/eclass/java-mvn-src.eclass b/eclass/java-mvn-src.eclass index da60cf8ea8e0..c34034eb00d7 100644 --- a/eclass/java-mvn-src.eclass +++ b/eclass/java-mvn-src.eclass @@ -1,9 +1,5 @@ -# Eclass for Java packages from bare sources exported by Maven -# -# Copyright (c) 2004-2011, Gentoo Foundation -# -# Licensed under the GNU General Public License, v2 -# +# Copyright 2004-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 # $Id$ inherit java-pkg-simple diff --git a/eclass/java-osgi.eclass b/eclass/java-osgi.eclass index 7e13ed2edd5f..46865fa8b1ce 100644 --- a/eclass/java-osgi.eclass +++ b/eclass/java-osgi.eclass @@ -1,10 +1,5 @@ -# Base eclass for Java packages that needs to be OSGi compliant -# -# Copyright (c) 2007, Jean-Noël Rivasseau -# Copyright (c) 2007-2011, Gentoo Foundation -# -# Licensed under the GNU General Public License, v2 -# +# Copyright 2007-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 # $Id$ # ----------------------------------------------------------------------------- diff --git a/eclass/java-pkg-2.eclass b/eclass/java-pkg-2.eclass index a0028c8200d7..6b770663cd2f 100644 --- a/eclass/java-pkg-2.eclass +++ b/eclass/java-pkg-2.eclass @@ -1,10 +1,5 @@ -# Eclass for Java packages -# -# Copyright (c) 2004-2005, Thomas Matthijs -# Copyright (c) 2004-2015, Gentoo Foundation -# -# Licensed under the GNU General Public License, v2 -# +# Copyright 2004-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 # $Id$ # @ECLASS: java-pkg-2.eclass diff --git a/eclass/java-pkg-opt-2.eclass b/eclass/java-pkg-opt-2.eclass index 9902837017c2..20c4cbc471e8 100644 --- a/eclass/java-pkg-opt-2.eclass +++ b/eclass/java-pkg-opt-2.eclass @@ -1,15 +1,5 @@ -# Eclass for optional Java packages -# -# Copyright (c) 2004-2005, Thomas Matthijs -# Copyright (c) 2004-2011, Gentoo Foundation -# -# Licensed under the GNU General Public License, v2 -# -# Major changes: -# 20070805: -# Removed phase hooks because Portage does proper env saving now. -# -# +# Copyright 2004-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 # $Id$ # @ECLASS: java-pkg-opt-2.eclass diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass index d5309bb105be..7abdb624de5e 100644 --- a/eclass/java-pkg-simple.eclass +++ b/eclass/java-pkg-simple.eclass @@ -1,9 +1,5 @@ -# Eclass for simple bare-source Java packages -# -# Copyright (c) 2004-2015, Gentoo Foundation -# -# Licensed under the GNU General Public License, v2 -# +# Copyright 2004-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 # $Id$ inherit java-utils-2 diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index e0984f33f633..302a82ab86de 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -1,11 +1,5 @@ -# Base eclass for Java packages -# -# Copyright (c) 2004-2005, Thomas Matthijs -# Copyright (c) 2004, Karl Trygve Kalleberg -# Copyright (c) 2004-2015, Gentoo Foundation -# -# Licensed under the GNU General Public License, v2 -# +# Copyright 2004-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 # $Id$ # @ECLASS: java-utils-2.eclass diff --git a/eclass/pam.eclass b/eclass/pam.eclass index a690e00a1034..c5d9108625f5 100644 --- a/eclass/pam.eclass +++ b/eclass/pam.eclass @@ -1,7 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 or later +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 # $Id$ -# # @ECLASS: pam.eclass # @MAINTAINER: diff --git a/eclass/twisted-r1.eclass b/eclass/twisted-r1.eclass index 2cb24e3f07a8..5b10491d25cf 100644 --- a/eclass/twisted-r1.eclass +++ b/eclass/twisted-r1.eclass @@ -1,5 +1,5 @@ # Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 or later +# Distributed under the terms of the GNU General Public License v2 # $Id$ # @ECLASS: twisted-r1.eclass diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.4.5.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.4.5.ebuild index e1cc44b84504..c063f7dcdfb9 100644 --- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.4.5.ebuild +++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.4.5.ebuild @@ -40,6 +40,7 @@ RDEPEND=" orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] ) !con, path, diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.5.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.5.ebuild new file mode 100644 index 000000000000..ae65c11b6a37 --- /dev/null +++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.5.ebuild @@ -0,0 +1,373 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils toolchain-funcs qt4-r2 systemd multilib + +DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers" +HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/" +SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz" +LICENSE="|| ( GPL-2 BSD )" + +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="ap dbus gnutls eap-sim fasteap +hs2-0 p2p ps3 qt4 readline selinux smartcard ssl tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD" +REQUIRED_USE="fasteap? ( !gnutls !ssl ) smartcard? ( ssl )" + +CDEPEND="dbus? ( sys-apps/dbus ) + kernel_linux? ( + eap-sim? ( sys-apps/pcsc-lite ) + dev-libs/libnl:3 + net-wireless/crda + ) + !kernel_linux? ( net-libs/libpcap ) + qt4? ( + dev-qt/qtcore:4 + dev-qt/qtgui:4 + dev-qt/qtsvg:4 + ) + readline? ( + sys-libs/ncurses:0= + sys-libs/readline:0 + ) + ssl? ( dev-libs/openssl:0 ) + !ssl? ( gnutls? ( net-libs/gnutls ) ) + !ssl? ( !gnutls? ( dev-libs/libtommath ) ) +" +DEPEND="${CDEPEND} + virtual/pkgconfig +" +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-networkmanager ) +" + +S="${WORKDIR}/${P}/${PN}" + +Kconfig_style_config() { + #param 1 is CONFIG_* item + #param 2 is what to set it = to, defaulting in y + CONFIG_PARAM="${CONFIG_HEADER:-CONFIG_}$1" + setting="${2:-y}" + + if [ ! $setting = n ]; then + #first remove any leading "# " if $2 is not n + sed -i "/^# *$CONFIG_PARAM=/s/^# *//" .config || echo "Kconfig_style_config error uncommenting $CONFIG_PARAM" + #set item = $setting (defaulting to y) + sed -i "/^$CONFIG_PARAM/s/=.*/=$setting/" .config || echo "Kconfig_style_config error setting $CONFIG_PARAM=$setting" + else + #ensure item commented out + sed -i "/^$CONFIG_PARAM/s/$CONFIG_PARAM/# $CONFIG_PARAM/" .config || echo "Kconfig_style_config error commenting $CONFIG_PARAM" + fi +} + +pkg_setup() { + if use gnutls && use ssl ; then + elog "You have both 'gnutls' and 'ssl' USE flags enabled: defaulting to USE=\"ssl\"" + fi +} + +src_prepare() { + # net/bpf.h needed for net-libs/libpcap on Gentoo/FreeBSD + sed -i \ + -e "s:\(#include \):#include \n\1:" \ + ../src/l2_packet/l2_packet_freebsd.c || die + + # People seem to take the example configuration file too literally (bug #102361) + sed -i \ + -e "s:^\(opensc_engine_path\):#\1:" \ + -e "s:^\(pkcs11_engine_path\):#\1:" \ + -e "s:^\(pkcs11_module_path\):#\1:" \ + wpa_supplicant.conf || die + + # Change configuration to match Gentoo locations (bug #143750) + sed -i \ + -e "s:/usr/lib/opensc:/usr/$(get_libdir):" \ + -e "s:/usr/lib/pkcs11:/usr/$(get_libdir):" \ + wpa_supplicant.conf || die + + #if use dbus; then + # epatch "${FILESDIR}/${P}-dbus-path-fix.patch" + #fi + + # systemd entries to D-Bus service files (bug #372877) + echo 'SystemdService=wpa_supplicant.service' \ + | tee -a dbus/*.service >/dev/null || die + + cd "${WORKDIR}/${P}" + + if use wimax; then + # generate-libeap-peer.patch comes before + # fix-undefined-reference-to-random_get_bytes.patch + epatch "${FILESDIR}/${P}-generate-libeap-peer.patch" + + # multilib-strict fix (bug #373685) + sed -e "s/\/usr\/lib/\/usr\/$(get_libdir)/" -i src/eap_peer/Makefile + fi + + # bug (320097) + epatch "${FILESDIR}/${P}-do-not-call-dbus-functions-with-NULL-path.patch" + + # TODO - NEED TESTING TO SEE IF STILL NEEDED, NOT COMPATIBLE WITH 1.0 OUT OF THE BOX, + # SO WOULD BE NICE TO JUST DROP IT, IF IT IS NOT NEEDED. + # bug (374089) + #epatch "${FILESDIR}/${P}-dbus-WPAIE-fix.patch" +} + +src_configure() { + # Toolchain setup + tc-export CC + + cp defconfig .config + + # Basic setup + Kconfig_style_config CTRL_IFACE + Kconfig_style_config BACKEND file + Kconfig_style_config IBSS_RSN + Kconfig_style_config IEEE80211W + Kconfig_style_config IEEE80211R + + # Basic authentication methods + # NOTE: we don't set GPSK or SAKE as they conflict + # with the below options + Kconfig_style_config EAP_GTC + Kconfig_style_config EAP_MD5 + Kconfig_style_config EAP_OTP + Kconfig_style_config EAP_PAX + Kconfig_style_config EAP_PSK + Kconfig_style_config EAP_TLV + Kconfig_style_config EAP_EXE + Kconfig_style_config IEEE8021X_EAPOL + Kconfig_style_config PKCS12 + Kconfig_style_config PEERKEY + Kconfig_style_config EAP_LEAP + Kconfig_style_config EAP_MSCHAPV2 + Kconfig_style_config EAP_PEAP + Kconfig_style_config EAP_TLS + Kconfig_style_config EAP_TTLS + + # Enabling background scanning. + Kconfig_style_config BGSCAN_SIMPLE + Kconfig_style_config BGSCAN_LEARN + + if use dbus ; then + Kconfig_style_config CTRL_IFACE_DBUS + Kconfig_style_config CTRL_IFACE_DBUS_NEW + Kconfig_style_config CTRL_IFACE_DBUS_INTRO + fi + + # Enable support for writing debug info to a log file and syslog. + Kconfig_style_config DEBUG_FILE + Kconfig_style_config DEBUG_SYSLOG + + if use hs2-0 ; then + Kconfig_style_config INTERWORKING + Kconfig_style_config HS20 + fi + + if use uncommon-eap-types; then + Kconfig_style_config EAP_GPSK + Kconfig_style_config EAP_SAKE + Kconfig_style_config EAP_GPSK_SHA256 + Kconfig_style_config EAP_IKEV2 + Kconfig_style_config EAP_EKE + fi + + if use eap-sim ; then + # Smart card authentication + Kconfig_style_config EAP_SIM + Kconfig_style_config EAP_AKA + Kconfig_style_config EAP_AKA_PRIME + Kconfig_style_config PCSC + fi + + if use fasteap ; then + Kconfig_style_config EAP_FAST + fi + + if use readline ; then + # readline/history support for wpa_cli + Kconfig_style_config READLINE + else + #internal line edit mode for wpa_cli + Kconfig_style_config WPA_CLI_EDIT + fi + + # SSL authentication methods + if use ssl ; then + Kconfig_style_config TLS openssl + elif use gnutls ; then + Kconfig_style_config TLS gnutls + Kconfig_style_config GNUTLS_EXTRA + else + Kconfig_style_config TLS internal + fi + + if use smartcard ; then + Kconfig_style_config SMARTCARD + fi + + if use tdls ; then + Kconfig_style_config TDLS + fi + + if use kernel_linux ; then + # Linux specific drivers + Kconfig_style_config DRIVER_ATMEL + Kconfig_style_config DRIVER_HOSTAP + Kconfig_style_config DRIVER_IPW + Kconfig_style_config DRIVER_NL80211 + Kconfig_style_config DRIVER_RALINK + Kconfig_style_config DRIVER_WEXT + Kconfig_style_config DRIVER_WIRED + + if use ps3 ; then + Kconfig_style_config DRIVER_PS3 + fi + + elif use kernel_FreeBSD ; then + # FreeBSD specific driver + Kconfig_style_config DRIVER_BSD + fi + + # Wi-Fi Protected Setup (WPS) + if use wps ; then + Kconfig_style_config WPS + Kconfig_style_config WPS2 + # USB Flash Drive + Kconfig_style_config WPS_UFD + # External Registrar + Kconfig_style_config WPS_ER + # Universal Plug'n'Play + Kconfig_style_config WPS_UPNP + # Near Field Communication + Kconfig_style_config WPS_NFC + fi + + # Wi-Fi Direct (WiDi) + if use p2p ; then + Kconfig_style_config P2P + Kconfig_style_config WIFI_DISPLAY + fi + + # Access Point Mode + if use ap ; then + Kconfig_style_config AP + fi + + # Enable mitigation against certain attacks against TKIP + Kconfig_style_config DELAYED_MIC_ERROR_REPORT + + # If we are using libnl 2.0 and above, enable support for it + # Bug 382159 + # Removed for now, since the 3.2 version is broken, and we don't + # support it. + if has_version ">=dev-libs/libnl-3.2"; then + Kconfig_style_config LIBNL32 + fi + + if use qt4 ; then + pushd "${S}"/wpa_gui-qt4 > /dev/null + eqmake4 wpa_gui.pro + popd > /dev/null + fi +} + +src_compile() { + einfo "Building wpa_supplicant" + emake V=1 BINDIR=/usr/sbin + + if use wimax; then + emake -C ../src/eap_peer clean + emake -C ../src/eap_peer + fi + + if use qt4 ; then + pushd "${S}"/wpa_gui-qt4 > /dev/null + einfo "Building wpa_gui" + emake + popd > /dev/null + fi +} + +src_install() { + dosbin wpa_supplicant + dobin wpa_cli wpa_passphrase + + # baselayout-1 compat + if has_version "=sys-apps/openrc-0.5.0"; then + newinitd "${FILESDIR}/${PN}-init.d" wpa_supplicant + newconfd "${FILESDIR}/${PN}-conf.d" wpa_supplicant + fi + + exeinto /etc/wpa_supplicant/ + newexe "${FILESDIR}/wpa_cli.sh" wpa_cli.sh + + dodoc ChangeLog {eap_testing,todo}.txt README{,-WPS} \ + wpa_supplicant.conf + + newdoc .config build-config + + doman doc/docbook/*.{5,8} + + if use qt4 ; then + into /usr + dobin wpa_gui-qt4/wpa_gui + doicon wpa_gui-qt4/icons/wpa_gui.svg + make_desktop_entry wpa_gui "WPA Supplicant Administration GUI" "wpa_gui" "Qt;Network;" + fi + + use wimax && emake DESTDIR="${D}" -C ../src/eap_peer install + + if use dbus ; then + pushd "${S}"/dbus > /dev/null + insinto /etc/dbus-1/system.d + newins dbus-wpa_supplicant.conf wpa_supplicant.conf + insinto /usr/share/dbus-1/system-services + doins fi.epitest.hostap.WPASupplicant.service fi.w1.wpa_supplicant1.service + popd > /dev/null + + # This unit relies on dbus support, bug 538600. + systemd_dounit systemd/wpa_supplicant.service + fi + + systemd_dounit "systemd/wpa_supplicant@.service" + systemd_dounit "systemd/wpa_supplicant-nl80211@.service" + systemd_dounit "systemd/wpa_supplicant-wired@.service" +} + +pkg_postinst() { + elog "If this is a clean installation of wpa_supplicant, you" + elog "have to create a configuration file named" + elog "/etc/wpa_supplicant/wpa_supplicant.conf" + elog + elog "An example configuration file is available for reference in" + elog "/usr/share/doc/${PF}/" + + if [[ -e ${ROOT}etc/wpa_supplicant.conf ]] ; then + echo + ewarn "WARNING: your old configuration file ${ROOT}etc/wpa_supplicant.conf" + ewarn "needs to be moved to ${ROOT}etc/wpa_supplicant/wpa_supplicant.conf" + fi + + # Mea culpa, feel free to remove that after some time --mgorny. + local fn + for fn in wpa_supplicant{,@wlan0}.service; do + if [[ -e "${ROOT}"/etc/systemd/system/network.target.wants/${fn} ]] + then + ebegin "Moving ${fn} to multi-user.target" + mv "${ROOT}"/etc/systemd/system/network.target.wants/${fn} \ + "${ROOT}"/etc/systemd/system/multi-user.target.wants/ + eend ${?} \ + "Please try to re-enable ${fn}" + fi + done +} diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest index e5365a61bf26..d4145e01ca5f 100644 --- a/sci-calculators/units/Manifest +++ b/sci-calculators/units/Manifest @@ -1,3 +1,3 @@ DIST units-2.11.tar.gz 861772 SHA256 53b6daf2a03d9a060449944b0a6c1aca0d18a84d1d9a93098e4a8920181f5abe SHA512 83e062a0daf9541454cdcaa4efe03bf9f03afdcfdbe2013d5e913a53e1b5e37ef846a3129185898ad2d25e3ea632533f8eb8d89681c855b19a3998aca6e733ce WHIRLPOOL 4c405e0a81af2b02d05156225c26573631ddb02d323d160b0850fcfda52b4a84a36f3ddbfdc732aa8a9dc06c8fc59a41141f985d6025ea6cb18b87749b78d500 -DIST units-2.11a.tar.gz 865120 SHA256 cdc1ef5adf0701f9bf0f9e3c890cd832554e5bf3f078dab852e5a6783e525b8b SHA512 d942194b73a4d920d711bdcf07481aefff8fc1403f47ca73c1c0fd9837cb7c385a45f326d9537ba1aa77283c4f812be346a1b5ac15ca1e508c268857cc9d78db WHIRLPOOL 72efc473f9105796bdbdc92e2e355a0a2c8ede0ae5febbc017a112b6524e6ad9081a581cc22666ed4e7e74a87bf1b8d45e3a262df53358cbe32107edbe4b6230 DIST units-2.11d.tar.gz 868580 SHA256 f1ba31658de19fa4ab3ecf791a08c590dc4f6dd5903c771bb9d678ba68ac785b SHA512 6e0dac8ae8830d0ab914e6e367f9473ac8c860cde9d189d05a8ade047037d21884a66e07733e8decc4d95325dcfb5a7110e4552b4b47c72b746cdc248354c1e5 WHIRLPOOL a54a33f50a0976d180e889485600de5354c94302dbe4b83aaff732efe9d473a07295d447b6d1df9fef766c35cb9571c947c4f12a23f8c21f8665ddb365078914 +DIST units-2.11f.tar.gz 874405 SHA256 ec01319a468f6f34bc65e312fa706e3a88ac1a34f7ddee24b4b751b810e95ea3 SHA512 25dc834d60845c835fbf9392d44c80fbc14c92cfa1dfbb0dd40fe3c21404aab4859d98be718a13fcf3a1857b8c1fe58c71691c4ff2bb309185a2f15e19497a17 WHIRLPOOL b718a8dae4111e9f89cc557f2544c069dfde212338146a8ccdca9c3b0ab0c5f6f91b4febfabdac0ff42bd5cc8d0788dca946656368820188557c6f47d63502b0 diff --git a/sci-calculators/units/units-2.11a.ebuild b/sci-calculators/units/units-2.11f.ebuild similarity index 97% rename from sci-calculators/units/units-2.11a.ebuild rename to sci-calculators/units/units-2.11f.ebuild index f22adadfccb6..b08c0855a475 100644 --- a/sci-calculators/units/units-2.11a.ebuild +++ b/sci-calculators/units/units-2.11f.ebuild @@ -30,8 +30,6 @@ RDEPEND=" ) " -DOCS=( ChangeLog NEWS README ) - units_cur_prepare() { local UNITS_PYTHON_MAJOR UNITS_PYTHON_MAJOR=$( @@ -57,5 +55,7 @@ units_cur_install() { src_install() { emake DESTDIR="${D}" HAVE_PYTHON=no install + dodoc ChangeLog NEWS README + use units_cur && python_foreach_impl units_cur_install } diff --git a/sys-apps/debianutils/debianutils-4.4.ebuild b/sys-apps/debianutils/debianutils-4.4.ebuild index 126fa01d68ad..9652b01a9a1c 100644 --- a/sys-apps/debianutils/debianutils-4.4.ebuild +++ b/sys-apps/debianutils/debianutils-4.4.ebuild @@ -15,8 +15,6 @@ SLOT="0" KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux" IUSE="kernel_linux static" -PDEPEND="|| ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin )" - src_prepare() { epatch "${FILESDIR}"/${PN}-3.4.2-no-bs-namespace.patch } diff --git a/sys-apps/debianutils/debianutils-4.5.1.ebuild b/sys-apps/debianutils/debianutils-4.5.1.ebuild index b05260fcfea1..e3c9a7170399 100644 --- a/sys-apps/debianutils/debianutils-4.5.1.ebuild +++ b/sys-apps/debianutils/debianutils-4.5.1.ebuild @@ -15,8 +15,6 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux" IUSE="kernel_linux static" -PDEPEND="|| ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin )" - S="${WORKDIR}/${PN}" src_prepare() { diff --git a/sys-auth/ykpers/Manifest b/sys-auth/ykpers/Manifest index 0b72836f091c..09ed5971f2a5 100644 --- a/sys-auth/ykpers/Manifest +++ b/sys-auth/ykpers/Manifest @@ -1,2 +1,3 @@ DIST ykpers-1.16.2.tar.gz 502198 SHA256 2b2da737d5353ff5c9002cad41c2f5d0af381f55a880ccf920cee8855b8b8120 SHA512 3fa1c18d306c4e5ca3f2b938cf4a1c9d1fbfcbaf9fdc1d5d601fb57ca11cd0caf680b0288bb37f27bb0e377a30bdc860f04d8c62254e9ccb4e78d60b60163799 WHIRLPOOL a2e045560cbeae600fc7c112105f3caa1f5e5cc26ce4ea12448cb451c1e6de3853f553c2a37a8b9138763e58795bf1896c1f3b3f0c4a3ebf8ddf95f758531694 DIST ykpers-1.17.1.tar.gz 504827 SHA256 556baec2bbc94bae01293e64dc3873d68f880119ea5c3772737e4f3dc44f69c4 SHA512 9f8cabb1082babc3214dda85300c1b3413d4664b9b5d32b266e3a640e1644ccf1a09964107f14eef831fef413fa65125551c40954a4973997b3e3cadb185bf70 WHIRLPOOL 75d430b41aa6dfca32db854278fa3dabea1a7048738b7274f787b2c2c81cf69e678ac7515cdc59295a764c8bf44773c247f51d4ccbb657c8c035055e51dcf468 +DIST ykpers-1.17.2.tar.gz 505396 SHA256 704a12410da22f37d69fd337511e74b61f876f841d52f13e87971c0adb5ddefc SHA512 b2da72c9032639450a91495766a828052d2a48c51ec151eedf61c3276f07feb8a7a5a0faf59179b314814fd6552de5f36e27494419cf7d2803d8471565a85690 WHIRLPOOL 2f0d59bc8487ca7b959502f7465c12a208726ce7356588d1c6378fcde87cc17d7c8a3141be447d3a401f799f51c1282f79b25db66412b2904c5a8c4fd3841c49 diff --git a/sys-auth/ykpers/ykpers-1.17.2.ebuild b/sys-auth/ykpers/ykpers-1.17.2.ebuild new file mode 100644 index 000000000000..ef4e2a8a5a92 --- /dev/null +++ b/sys-auth/ykpers/ykpers-1.17.2.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit autotools-utils udev + +DESCRIPTION="Library and tool for personalization of Yubico's YubiKey" +SRC_URI="http://yubico.github.io/yubikey-personalization/releases/${P}.tar.gz" +HOMEPAGE="https://github.com/Yubico/yubikey-personalization" + +KEYWORDS="~amd64 ~x86" +SLOT="0" +LICENSE="BSD-2" +IUSE="static-libs consolekit" + +RDEPEND=" + >=sys-auth/libyubikey-1.6 + virtual/libusb:1" +DEPEND="${RDEPEND} + virtual/pkgconfig" +RDEPEND="${RDEPEND} + consolekit? ( sys-auth/consolekit[acl] )" + +src_install() { + DOCS=( doc/. AUTHORS ChangeLog NEWS README ) + autotools-utils_src_install + + use consolekit && udev_dorules *.rules +} diff --git a/sys-auth/yubikey-personalization-gui/Manifest b/sys-auth/yubikey-personalization-gui/Manifest index c73daba26207..c6726f8b070d 100644 --- a/sys-auth/yubikey-personalization-gui/Manifest +++ b/sys-auth/yubikey-personalization-gui/Manifest @@ -1,3 +1,4 @@ DIST yubikey-personalization-gui-3.1.18.tar.gz 1450161 SHA256 83e375bff4844ebebf473dfa9f62526689cb5160f7a8dca56896c8f47e3cb1cb SHA512 039b27f6b475d63fb0bc5de8dfaa1f8b86652a483c2a2930d74fc7ae1105232146283071fe1e6b0225e85397fcae46a7724e7f0e5c8f20685c6b18d0dced95c8 WHIRLPOOL 83176c32fc6d252d675124a7b0a16e7be49bea758bae4dc512b2f7e14ad27bc59bdec521882863c0b77ccd6c19c36a5cce24fa9b07ffa7ad636d120fee9539b5 DIST yubikey-personalization-gui-3.1.20.tar.gz 1458155 SHA256 70e31105900b571792de8ccd41ac4b080a10ecd8c7268c44b4676752d350f994 SHA512 d8b9165ade8f9a8be24d3aabd1b5096c01842e719bf7b70d46a54fd809d2fcbbf515ef95759f00601cf9fa6dcc01aa0e0de802da643c306eacdf7c1a1a576081 WHIRLPOOL 0c9589424a2fa51558d90bf7ee5410746683f57949836fd7c16f89f164c8eb4c60dc9386b5403f78187254d838e5eecaca8188b560a391e7da449e49e8377dfe DIST yubikey-personalization-gui-3.1.21.tar.gz 1876316 SHA256 155cdf25088ffd5f6fdca4fa7433b23a9c30bfd778b5cffb70654839a071b5ac SHA512 4fa48fbc306c0488941a5151f91f2b00f05a5e917d664197e92d9d50f6ffc01874f85f7a37ff1fdad0f322c279ebf44deaebd75fb4671653ad7ec4cc9735571a WHIRLPOOL 2ff0619e54a4198cc916cfe24969f1a83572adebfe8ec3c0638fd3cddd898a9011a9eb32d1ea51ad2e4cceb3c59b1a32fc42d37ccd1a9c552d482e4a766c2f64 +DIST yubikey-personalization-gui-3.1.23.tar.gz 1450340 SHA256 80747cca7c77c384f175b92ea360955c034dcff8f7552dae080ad2b70ff81897 SHA512 912bcbcac5cad285c43995f646de6aa68cc99a4d047b7632786cd93e38c031e2fb8dcc4f57f45647ba3e276de03aaea6ed9757f72ec2c42a43780c19edcca51b WHIRLPOOL fdc625fa4fd2a34a79c45209e274a1ddaf2934e3bf4301a790b8c1b22f4d8032f62362a31ed188025f8676d2b4f5c92270b8c0007045664af1c4d02b948ad696 diff --git a/sys-auth/yubikey-personalization-gui/yubikey-personalization-gui-3.1.23.ebuild b/sys-auth/yubikey-personalization-gui/yubikey-personalization-gui-3.1.23.ebuild new file mode 100644 index 000000000000..eb899abb4023 --- /dev/null +++ b/sys-auth/yubikey-personalization-gui/yubikey-personalization-gui-3.1.23.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils qmake-utils + +DESCRIPTION="GUI for personalization of Yubico's YubiKey" +SRC_URI="http://yubico.github.io/yubikey-personalization-gui/releases/${P}.tar.gz" +HOMEPAGE="https://github.com/Yubico/yubikey-personalization-gui" + +KEYWORDS="~amd64" +SLOT="0" +LICENSE="BSD-2" +IUSE="debug" + +RDEPEND=" + >=sys-auth/ykpers-1.14.0 + >=sys-auth/libyubikey-1.6 + dev-qt/qtcore:4 + dev-qt/qtgui:4 + dev-qt/qttest:4 + dev-libs/glib:2 + virtual/libusb:1" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +DOCS=( NEWS README ) + +src_configure() { + eqmake4 YKPersonalization.pro +} + +src_install() { + dobin build/release/yubikey-personalization-gui + doman resources/lin/yubikey-personalization-gui.1 + domenu resources/lin/yubikey-personalization-gui.desktop + doicon resources/lin/yubikey-personalization-gui.xpm + doicon -s 128 resources/lin/yubikey-personalization-gui.png +} diff --git a/sys-boot/os-prober/Manifest b/sys-boot/os-prober/Manifest index 2300cc357cc4..6b16974935fd 100644 --- a/sys-boot/os-prober/Manifest +++ b/sys-boot/os-prober/Manifest @@ -1,2 +1,3 @@ DIST os-prober_1.65.tar.xz 24712 SHA256 c4a7661a52edae722f7e6bacb3f107cf7086cbe768275fadf5398d04360bfc84 SHA512 64dd9042a26dc859d9186bb48545d85b1a369d00a93b5045c420eac0c4b672ab32cb6028eada5f1cc21c8ab9386c35b8eedb79bc7975faf7b0a7b2841b284f53 WHIRLPOOL 397a92312b018fa08b2e838bc6b85fa4d55502dfb8e8725c79f4a0ae397e3bd258a7bb302f74b2293cd85f4ddabf4cba75ff2b4b57fa9904094c3a50e1ace36e DIST os-prober_1.66.tar.xz 24904 SHA256 ab66eab63223d651cb6f9221ddffc958521b13edee4996c4fd87f08cb1955057 SHA512 6aaa2787be9ea522ae71b8c65fc04bb05af233c81e2a8cd0c27b79d6f8c697c5585b5f5fce91c67eab3bbc782e29087fb22db2626609702ab272a398e59ce333 WHIRLPOOL 12d058e78ddd168938b0160b8a2348b497d24c17b99a30a34edcd3e663e8c57eded8d85d02d97c85ad936aadce123387c85dd9c3f0510bf200a9fbf632fd95bf +DIST os-prober_1.67.tar.xz 25092 SHA256 69d5b5f5ab9182025fda9cfd9f09be20f28ed6fe7ea07c26664d5e571ed355aa SHA512 bc05256d9e1ef808ccaf5a95e23a811f3086ad5b54b444b30b9b21e0c56c71f5c4a7dc69b5d2604ec90209f9a0ef1e00286da016f953f430a5c269a6dc75a718 WHIRLPOOL 5b88ed969d64555ee663a19572bfeaff8ecd3ca750765133791fe597f953394630b3a631c49733142775291ad61fedccec0090f26ab3017f0df2607fc49ad6ca diff --git a/sys-boot/os-prober/os-prober-1.67.ebuild b/sys-boot/os-prober/os-prober-1.67.ebuild new file mode 100644 index 000000000000..1163bc0625af --- /dev/null +++ b/sys-boot/os-prober/os-prober-1.67.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +#inherit eutils multilib toolchain-funcs +inherit toolchain-funcs + +DESCRIPTION="Utility to detect other OSs on a set of drives" +HOMEPAGE="http://packages.debian.org/source/sid/os-prober" +SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +src_prepare() { + # use default GNU rules + rm Makefile || die 'rm Makefile failed' + # Fix references to grub-mount + sed -i -e 's:grub-mount:grub2-mount:g' \ + common.sh \ + linux-boot-probes/common/50mounted-tests \ + os-probes/common/50mounted-tests +} + +src_compile() { + tc-export CC + emake newns +} + +src_install() { + dobin os-prober linux-boot-prober + + # Note: as no shared libraries are installed, /usr/lib is correct + exeinto /usr/lib/os-prober + doexe newns + + insinto /usr/share/os-prober + doins common.sh + + keepdir /var/lib/os-prober + + local debarch=${ARCH%-*} dir + + case ${debarch} in + amd64) debarch=x86 ;; + ppc|ppc64) debarch=powerpc ;; + esac + + for dir in os-probes{,/mounted,/init} linux-boot-probes{,/mounted}; do + exeinto /usr/lib/$dir + doexe $dir/common/* + if [[ -d $dir/$debarch ]]; then + doexe $dir/$debarch/* + fi + if [[ -d $dir/$debarch/efi ]]; then + exeinto /usr/lib/$dir/efi + doexe $dir/$debarch/efi/* + fi + done + + if use amd64 || use x86; then + exeinto /usr/lib/os-probes/mounted + doexe os-probes/mounted/powerpc/20macosx + fi + + dodoc README TODO debian/changelog +} + +pkg_postinst() { + elog "If you intend for os-prober to detect versions of Windows installed on" + elog "NTFS-formatted partitions, your system must be capable of reading the" + elog "NTFS filesystem. One way to do this is by installing sys-fs/ntfs3g" +} diff --git a/sys-devel/gcc/gcc-4.9.3.ebuild b/sys-devel/gcc/gcc-4.9.3.ebuild index c30b716ad67f..199d89f33bc1 100644 --- a/sys-devel/gcc/gcc-4.9.3.ebuild +++ b/sys-devel/gcc/gcc-4.9.3.ebuild @@ -22,7 +22,7 @@ SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm" inherit eutils toolchain -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 m68k ~mips ppc ppc64 s390 sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~x86-fbsd" RDEPEND="" DEPEND="${RDEPEND} diff --git a/sys-fs/udev/udev-216.ebuild b/sys-fs/udev/udev-216.ebuild index 65484b59edfe..5f05596abf6a 100644 --- a/sys-fs/udev/udev-216.ebuild +++ b/sys-fs/udev/udev-216.ebuild @@ -14,10 +14,10 @@ else patchset=2 SRC_URI="http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz" if [[ -n "${patchset}" ]]; then - SRC_URI="${SRC_URI} - https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz - https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz" - fi + SRC_URI+=" + https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz + https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz" + fi KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" fi diff --git a/sys-fs/udev/udev-217.ebuild b/sys-fs/udev/udev-217.ebuild index 72c60897e706..a55cf5130888 100644 --- a/sys-fs/udev/udev-217.ebuild +++ b/sys-fs/udev/udev-217.ebuild @@ -14,10 +14,10 @@ else patchset=1 SRC_URI="http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz" if [[ -n "${patchset}" ]]; then - SRC_URI="${SRC_URI} - https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz - https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz" - fi + SRC_URI+=" + https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz + https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz" + fi KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" fi diff --git a/sys-fs/udev/udev-218.ebuild b/sys-fs/udev/udev-218.ebuild index 4fe075309b2e..b805dda5d049 100644 --- a/sys-fs/udev/udev-218.ebuild +++ b/sys-fs/udev/udev-218.ebuild @@ -14,10 +14,10 @@ else patchset=1 SRC_URI="http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz" if [[ -n "${patchset}" ]]; then - SRC_URI="${SRC_URI} - https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz - https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz" - fi + SRC_URI+=" + https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz + https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz" + fi KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" fi diff --git a/sys-fs/udev/udev-219.ebuild b/sys-fs/udev/udev-219.ebuild index f0cd6cfd0f48..def594a248fc 100644 --- a/sys-fs/udev/udev-219.ebuild +++ b/sys-fs/udev/udev-219.ebuild @@ -14,10 +14,10 @@ else patchset= SRC_URI="http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz" if [[ -n "${patchset}" ]]; then - SRC_URI="${SRC_URI} - https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz - https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz" - fi + SRC_URI+=" + https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz + https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz" + fi KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" fi diff --git a/sys-fs/udev/udev-220-r3.ebuild b/sys-fs/udev/udev-220-r3.ebuild index 322f82e8a321..e311f19c9727 100644 --- a/sys-fs/udev/udev-220-r3.ebuild +++ b/sys-fs/udev/udev-220-r3.ebuild @@ -14,10 +14,10 @@ else patchset=4 SRC_URI="http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz" if [[ -n "${patchset}" ]]; then - SRC_URI="${SRC_URI} - https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz - https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz" - fi + SRC_URI+=" + https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz + https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz" + fi KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" fi diff --git a/sys-fs/udev/udev-222.ebuild b/sys-fs/udev/udev-222.ebuild index ce7fec1d7691..bd34bc619bc5 100644 --- a/sys-fs/udev/udev-222.ebuild +++ b/sys-fs/udev/udev-222.ebuild @@ -13,10 +13,10 @@ else patchset= SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz" if [[ -n "${patchset}" ]]; then - SRC_URI="${SRC_URI} - https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz - https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz" - fi + SRC_URI+=" + https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz + https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz" + fi KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" fi diff --git a/sys-fs/udev/udev-224-r1.ebuild b/sys-fs/udev/udev-224-r1.ebuild index 6dc09d1d600d..1602746594de 100644 --- a/sys-fs/udev/udev-224-r1.ebuild +++ b/sys-fs/udev/udev-224-r1.ebuild @@ -13,10 +13,10 @@ else patchset= SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz" if [[ -n "${patchset}" ]]; then - SRC_URI="${SRC_URI} - https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz - https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz" - fi + SRC_URI+=" + https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz + https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz" + fi KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" fi diff --git a/sys-fs/udev/udev-224-r2.ebuild b/sys-fs/udev/udev-224-r2.ebuild index 85f15a89eb30..66493c98bbc3 100644 --- a/sys-fs/udev/udev-224-r2.ebuild +++ b/sys-fs/udev/udev-224-r2.ebuild @@ -13,10 +13,10 @@ else patchset= SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz" if [[ -n "${patchset}" ]]; then - SRC_URI="${SRC_URI} - https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz - https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz" - fi + SRC_URI+=" + https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz + https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz" + fi KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" fi diff --git a/sys-fs/udev/udev-224.ebuild b/sys-fs/udev/udev-224.ebuild index 01e4a0a6bd52..39dea9ab8628 100644 --- a/sys-fs/udev/udev-224.ebuild +++ b/sys-fs/udev/udev-224.ebuild @@ -13,10 +13,10 @@ else patchset= SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz" if [[ -n "${patchset}" ]]; then - SRC_URI="${SRC_URI} - https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz - https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz" - fi + SRC_URI+=" + https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz + https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz" + fi KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" fi diff --git a/sys-fs/udev/udev-225.ebuild b/sys-fs/udev/udev-225.ebuild index 96cc496e3673..d173c0f56a53 100644 --- a/sys-fs/udev/udev-225.ebuild +++ b/sys-fs/udev/udev-225.ebuild @@ -13,10 +13,10 @@ else patchset= SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz" if [[ -n "${patchset}" ]]; then - SRC_URI="${SRC_URI} - https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz - https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz" - fi + SRC_URI+=" + https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz + https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz" + fi KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" fi diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild index 96cc496e3673..d173c0f56a53 100644 --- a/sys-fs/udev/udev-9999.ebuild +++ b/sys-fs/udev/udev-9999.ebuild @@ -13,10 +13,10 @@ else patchset= SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz" if [[ -n "${patchset}" ]]; then - SRC_URI="${SRC_URI} - https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz - https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz" - fi + SRC_URI+=" + https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz + https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz" + fi KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" fi diff --git a/www-apache/passenger/passenger-5.0.20-r1.ebuild b/www-apache/passenger/passenger-5.0.20-r1.ebuild index 140bd12d6a1c..a9c600ab93b9 100644 --- a/www-apache/passenger/passenger-5.0.20-r1.ebuild +++ b/www-apache/passenger/passenger-5.0.20-r1.ebuild @@ -1,4 +1,3 @@ - # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/www-apache/passenger/passenger-5.0.20.ebuild b/www-apache/passenger/passenger-5.0.20.ebuild index 989ba35136f3..b385fee2e1fa 100644 --- a/www-apache/passenger/passenger-5.0.20.ebuild +++ b/www-apache/passenger/passenger-5.0.20.ebuild @@ -1,4 +1,3 @@ - # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/www-apps/icingaweb2-module-pnp4nagios/Manifest b/www-apps/icingaweb2-module-pnp4nagios/Manifest new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/www-apps/icingaweb2-module-pnp4nagios/icingaweb2-module-pnp4nagios-9999.ebuild b/www-apps/icingaweb2-module-pnp4nagios/icingaweb2-module-pnp4nagios-9999.ebuild new file mode 100644 index 000000000000..6fc2284be680 --- /dev/null +++ b/www-apps/icingaweb2-module-pnp4nagios/icingaweb2-module-pnp4nagios-9999.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit git-2 + +DESCRIPTION="Icinga Web 2 - Frontend for icinga2" +HOMEPAGE="http://www.icinga.org/" +EGIT_REPO_URI="https://github.com/Icinga/icingaweb2-module-pnp4nagios.git" +EGIT_BRANCH="master" + +LICENSE="GPL-2" +SLOT="0" +IUSE="" +KEYWORDS="" + +DEPEND=">=net-analyzer/icinga2-2.1.1 + >=www-apps/icingaweb2-2.0.0" +RDEPEND="${DEPEND}" + +src_install() { + mkdir -p "${D}/usr/share/icingaweb2/modules/pnp4nagios" + cp -R "${S}"/* "${D}/usr/share/icingaweb2/modules/pnp4nagios" +} diff --git a/www-apps/icingaweb2-module-pnp4nagios/metadata.xml b/www-apps/icingaweb2-module-pnp4nagios/metadata.xml new file mode 100644 index 000000000000..d5dfd322223c --- /dev/null +++ b/www-apps/icingaweb2-module-pnp4nagios/metadata.xml @@ -0,0 +1,10 @@ + + + + + prometheanfire@gentoo.org + Matthew Thode + + + + diff --git a/x11-misc/shared-mime-info/Manifest b/x11-misc/shared-mime-info/Manifest index 120b07da8a34..3d29b4ce30ce 100644 --- a/x11-misc/shared-mime-info/Manifest +++ b/x11-misc/shared-mime-info/Manifest @@ -1 +1,2 @@ DIST shared-mime-info-1.4.tar.xz 537916 SHA256 bbc0bd023f497dfd75e1ca73441cbbb5a63617d9e14f2790b868361cc055b5b1 SHA512 ac643a5360c1e4811b2df8e3c52434e5ee48f8e62a01ede3fb0895d30721b58b5b26c0edc43f779576ff899bd1a8b181699a08dbbb1e956394555f6ca983a582 WHIRLPOOL 32cb301cd54140b83af8c321b7ebc571b87b07ca86bfc68e6760e4dd3551188a092a96087042b13f1278c11cd88c261879fc816d0c2efcbee473211d929194bf +DIST shared-mime-info-1.5.tar.xz 559040 SHA256 d6412840eb265bf36e61fd7b6fc6bea21b0f58cb22bed16f2ccccdd54bea4180 SHA512 8a97c8fa5a60eede056a42c36d9f8d015bf2788feca4630397ef71ba2cfe29ad469fb1669c368674edd4661af6b2f6823377cc27525f44c61788533c0c28e22a WHIRLPOOL 157dfc0f3a6aacde8ca734217f9a3b2e8baa9bc0254a2024716136215624e642b25537216f79c9a95ba55ee70dff872eb746cb3e0e07cb31a8a190d7d5bf6b7b diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.5.ebuild b/x11-misc/shared-mime-info/shared-mime-info-1.5.ebuild new file mode 100644 index 000000000000..e192913e14a6 --- /dev/null +++ b/x11-misc/shared-mime-info/shared-mime-info-1.5.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils fdo-mime + +DESCRIPTION="The Shared MIME-info Database specification" +HOMEPAGE="http://freedesktop.org/wiki/Software/shared-mime-info" +SRC_URI="http://people.freedesktop.org/~hadess/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="test" + +RDEPEND=">=dev-libs/glib-2 + dev-libs/libxml2" +DEPEND="${RDEPEND} + dev-util/intltool + sys-devel/gettext + virtual/pkgconfig" + +DOCS=( ChangeLog HACKING NEWS README ) + +src_prepare() { + epatch_user +} + +src_configure() { + export ac_cv_func_fdatasync=no #487504 + + econf \ + $(use_enable test default-make-check) \ + --disable-update-mimedb +} + +src_compile() { + # FIXME: 0.91 fails with -j9 every second time like: + # update_mime_database-update-mime-database.o: file not recognized: File truncated + # collect2: ld returned 1 exit status + emake -j1 +} + +src_install() { + default + + # in prefix, install an env.d entry such that prefix patch is used/added + if use prefix; then + echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share\"" > "${T}"/50mimeinfo + doenvd "${T}"/50mimeinfo + fi +} + +pkg_postinst() { + use prefix && export XDG_DATA_DIRS="${EPREFIX}"/usr/share + fdo-mime_mime_database_update +}