diff --git a/app-admin/cli53/Manifest b/app-admin/cli53/Manifest
index 6568ce2c5930..ab55c97c89d3 100644
--- a/app-admin/cli53/Manifest
+++ b/app-admin/cli53/Manifest
@@ -1 +1 @@
-DIST cli53-0.7.3.tar.gz 3268731 SHA256 0f14e8a17ed00ed7ac7b6d7ecc8bbba1a0fdbbd415e8c93f74b59d3f7988d067 SHA512 7472c5165b18dba611c46adcf5cc328d077ffcecaca6cb569abece47e3cc367a135072c180807a3cbc8e087a1725eac20f884e061ccfc46db59eb6bc6e13bcf6 WHIRLPOOL 5b43703d2301e8b3d5b9f34f1efb6fe7a72f78be48cc0836134a8a92ed24f643f19dd36d0b1b9a08d5d863fce8acfe1e73f1b012e211644c00df5a10801591d9
+DIST cli53-0.7.4.tar.gz 3270107 SHA256 3cb89e6aa91676ffd0577798a4b06b056667d18ad836de4fa31c0564ee48474e SHA512 fb0fb7891dacf07b4a34861c6c93d8ab8c177710345cfb6d39feb56892d6b9fa8d39b1d933323a6649e3fefdb941cdc7d4940bbdb7040d41a99ea988c3b976fa WHIRLPOOL a62f999666215540afbd4bfbdc07366a772900520c21fb9e65dbcc7d7da6ea5c0354017c1ff1c1825ba84c777e7c1a07367ac521ce0aedaefe21ca2ec0c52871
diff --git a/app-admin/cli53/cli53-0.7.3.ebuild b/app-admin/cli53/cli53-0.7.4.ebuild
similarity index 55%
rename from app-admin/cli53/cli53-0.7.3.ebuild
rename to app-admin/cli53/cli53-0.7.4.ebuild
index ce3cb7cf1b46..834f3a3771c5 100644
--- a/app-admin/cli53/cli53-0.7.3.ebuild
+++ b/app-admin/cli53/cli53-0.7.4.ebuild
@@ -4,21 +4,29 @@
EAPI=6
-inherit golang-vcs-snapshot
+if [[ ${PV} == 9999 ]]; then
+ inherit golang-vcs
+else
+ inherit golang-vcs-snapshot
+ SRC_URI="https://github.com/barnybug/cli53/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
DESCRIPTION="Command line tool for Amazon Route 53"
HOMEPAGE="https://github.com/barnybug/cli53"
-SRC_URI="https://github.com/barnybug/cli53/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64"
EGO_PN="github.com/barnybug/cli53"
S="${WORKDIR}/${P}/src/${EGO_PN}"
src_compile() {
- GOPATH="${WORKDIR}/${P}" emake version=${PV} build
+ if [[ ${PV} == 9999 ]]; then
+ GOPATH="${WORKDIR}/${P}" emake build
+ else
+ GOPATH="${WORKDIR}/${P}" emake build version=${PV}
+ fi
}
src_test() {
@@ -27,5 +35,5 @@ src_test() {
src_install() {
dobin cli53
- dodoc {CHANGELOG,README}.md
+ dodoc CHANGELOG.md README.md
}
diff --git a/app-admin/cli53/cli53-9999.ebuild b/app-admin/cli53/cli53-9999.ebuild
new file mode 100644
index 000000000000..834f3a3771c5
--- /dev/null
+++ b/app-admin/cli53/cli53-9999.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+if [[ ${PV} == 9999 ]]; then
+ inherit golang-vcs
+else
+ inherit golang-vcs-snapshot
+ SRC_URI="https://github.com/barnybug/cli53/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Command line tool for Amazon Route 53"
+HOMEPAGE="https://github.com/barnybug/cli53"
+
+LICENSE="MIT"
+SLOT="0"
+
+EGO_PN="github.com/barnybug/cli53"
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+src_compile() {
+ if [[ ${PV} == 9999 ]]; then
+ GOPATH="${WORKDIR}/${P}" emake build
+ else
+ GOPATH="${WORKDIR}/${P}" emake build version=${PV}
+ fi
+}
+
+src_test() {
+ GOPATH="${WORKDIR}/${P}" go test -v || die
+}
+
+src_install() {
+ dobin cli53
+ dodoc CHANGELOG.md README.md
+}
diff --git a/app-admin/mktwpol/metadata.xml b/app-admin/mktwpol/metadata.xml
index 5261d9f64496..e635c47b95a4 100644
--- a/app-admin/mktwpol/metadata.xml
+++ b/app-admin/mktwpol/metadata.xml
@@ -9,7 +9,6 @@
c.cboldt@gmail.com
Chuck Seyboldt
- Will reply to bug reports
https://sourceforge.net/p/mktwpol/code/ci/master/tree/CHANGES
https://sourceforge.net/p/mktwpol/code/ci/master/tree/README
diff --git a/app-arch/pax/files/pax-20160306-glibc-to-linux.patch b/app-arch/pax/files/pax-20160306-glibc-to-linux.patch
new file mode 100644
index 000000000000..f864729cc4fe
--- /dev/null
+++ b/app-arch/pax/files/pax-20160306-glibc-to-linux.patch
@@ -0,0 +1,38 @@
+--- pax/cache.c.old 2016-03-06 08:12:52.000000000 -0600
++++ pax/cache.c 2016-04-17 13:01:26.461307830 -0500
+@@ -195,7 +195,7 @@
+ * No entry for this uid, we will add it
+ */
+ if (!pwopn) {
+-#if defined(__GLIBC__)
++#if defined(__GLIBC__) || defined(__linux__)
+ setpwent();
+ #elif !defined(__INTERIX)
+ setpassent(1);
+@@ -265,7 +265,7 @@
+ * No entry for this gid, we will add it
+ */
+ if (!gropn) {
+-#if defined(__GLIBC__)
++#if defined(__GLIBC__) || defined(__linux__)
+ setgrent();
+ #elif !defined(__INTERIX) && !defined(__CYGWIN__)
+ setgroupent(1);
+@@ -336,7 +336,7 @@
+ }
+
+ if (!pwopn) {
+-#if defined(__GLIBC__)
++#if defined(__GLIBC__) || defined(__linux__)
+ setpwent();
+ #elif !defined(__INTERIX)
+ setpassent(1);
+@@ -403,7 +403,7 @@
+ }
+
+ if (!gropn) {
+-#if defined(__GLIBC__)
++#if defined(__GLIBC__) || defined(__linux__)
+ setgrent();
+ #elif !defined(__INTERIX) && !defined(__CYGWIN__)
+ setgroupent(1);
diff --git a/app-arch/pax/pax-20160306.ebuild b/app-arch/pax/pax-20160306.ebuild
index 1cfdaa455475..86a44b8cbdfe 100644
--- a/app-arch/pax/pax-20160306.ebuild
+++ b/app-arch/pax/pax-20160306.ebuild
@@ -4,7 +4,7 @@
EAPI="5"
-inherit unpacker toolchain-funcs
+inherit unpacker toolchain-funcs flag-o-matic
DESCRIPTION="pax (Portable Archive eXchange) is the POSIX standard archive tool"
HOMEPAGE="https://www.mirbsd.org/pax.htm"
@@ -15,15 +15,19 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
IUSE=""
-RDEPEND="dev-libs/libbsd"
+RDEPEND="dev-libs/libbsd
+ elibc_musl? ( sys-libs/fts-standalone )"
DEPEND="${RDEPEND}
$(unpacker_src_uri_depends)"
S=${WORKDIR}/${PN}
+PATCHES=( "${FILESDIR}/${P}-glibc-to-linux.patch" )
+
src_prepare() {
# Newer C libraries omit this include from sys/types.h.
sed -i '1i#include ' extern.h || die
+ default
}
src_configure() {
@@ -31,6 +35,8 @@ src_configure() {
}
src_compile() {
+ use elibc_musl && append-ldflags "-lfts"
+
# We can't rely on LFS flags as it uses the fts.h interface which lacks 64-bit support.
set -- \
${CC} ${CPPFLAGS} ${CFLAGS} \
diff --git a/app-cdr/cdrtools/metadata.xml b/app-cdr/cdrtools/metadata.xml
index c8b67cfbbd16..f3f8095939f6 100644
--- a/app-cdr/cdrtools/metadata.xml
+++ b/app-cdr/cdrtools/metadata.xml
@@ -8,7 +8,6 @@
joerg.schilling@fokus.fraunhofer.de
- Upstream author, please CC on bugs
cdrtools
diff --git a/app-crypt/gnupg/metadata.xml b/app-crypt/gnupg/metadata.xml
index 044fd43416a3..04058e5e2764 100644
--- a/app-crypt/gnupg/metadata.xml
+++ b/app-crypt/gnupg/metadata.xml
@@ -10,14 +10,12 @@
defined by RFC4880.