4 files changed, 7 insertions, 142 deletions
diff --git a/sys-libs/libnih/libnih-1.0.3-r1.ebuild b/sys-libs/libnih/libnih-1.0.3-r1.ebuild
deleted file mode 100644
index 17294ea7b38c..000000000000
--- a/sys-libs/libnih/libnih-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit versionator eutils autotools toolchain-funcs multilib
-
-DESCRIPTION="Light-weight 'standard library' of C functions"
-HOMEPAGE="https://launchpad.net/libnih"
-SRC_URI="https://launchpad.net/${PN}/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+dbus nls static-libs test +threads"
-
-RDEPEND="dbus? ( dev-libs/expat >=sys-apps/dbus-1.2.16 )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( dev-util/valgrind )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.0.3-optional-dbus.patch
-	epatch "${FILESDIR}"/${PN}-1.0.3-pkg-config.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with dbus) \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		$(use_enable threads) \
-		$(use_enable threads threading)
-}
-
-src_install() {
-	default
-
-	# we need to be in / because upstart needs libnih
-	gen_usr_ldscript -a nih $(use dbus && echo nih-dbus)
-	use static-libs || rm "${ED}"/usr/$(get_libdir)/*.la
-}
diff --git a/sys-libs/libnih/libnih-1.0.3-r2.ebuild b/sys-libs/libnih/libnih-1.0.3-r2.ebuild
deleted file mode 100644
index a1f3a5cd0961..000000000000
--- a/sys-libs/libnih/libnih-1.0.3-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit versionator eutils autotools toolchain-funcs multilib flag-o-matic
-
-DESCRIPTION="Light-weight 'standard library' of C functions"
-HOMEPAGE="https://launchpad.net/libnih"
-SRC_URI="https://launchpad.net/${PN}/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+dbus nls static-libs test +threads"
-
-RDEPEND="dbus? ( dev-libs/expat >=sys-apps/dbus-1.2.16 )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( dev-util/valgrind )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.0.3-optional-dbus.patch
-	epatch "${FILESDIR}"/${PN}-1.0.3-pkg-config.patch
-	eautoreconf
-}
-
-src_configure() {
-	append-lfs-flags
-	econf \
-		$(use_with dbus) \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		$(use_enable threads) \
-		$(use_enable threads threading)
-}
-
-src_install() {
-	default
-
-	# we need to be in / because upstart needs libnih
-	gen_usr_ldscript -a nih $(use dbus && echo nih-dbus)
-	use static-libs || rm "${ED}"/usr/$(get_libdir)/*.la
-}
diff --git a/sys-libs/libnih/libnih-1.0.3-r3.ebuild b/sys-libs/libnih/libnih-1.0.3-r3.ebuild
index 1f8d2acaccfe..dd1ab1ccb982 100644
--- a/sys-libs/libnih/libnih-1.0.3-r3.ebuild
+++ b/sys-libs/libnih/libnih-1.0.3-r3.ebuild
@@ -12,14 +12,17 @@ SRC_URI="https://launchpad.net/${PN}/$(get_version_component_range 1-2)/${PV}/+d
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
-IUSE="+dbus nls static-libs test +threads"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~x86"
+IUSE="+dbus nls static-libs +threads"
 
+# The configure phase will check for valgrind headers, and the tests will use
+# that header, but only to do dynamic valgrind detection.  The tests aren't
+# run directly through valgrind, only by developers directly.  So don't bother
+# depending on valgrind here. #559830
 RDEPEND="dbus? ( dev-libs/expat >=sys-apps/dbus-1.2.16 )"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( dev-util/valgrind )"
+	virtual/pkgconfig"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.0.3-optional-dbus.patch
diff --git a/sys-libs/libnih/libnih-1.0.3.ebuild b/sys-libs/libnih/libnih-1.0.3.ebuild
deleted file mode 100644
index bae14208cb19..000000000000
--- a/sys-libs/libnih/libnih-1.0.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit versionator eutils autotools toolchain-funcs
-
-DESCRIPTION="Light-weight 'standard library' of C functions"
-HOMEPAGE="https://launchpad.net/libnih"
-SRC_URI="https://launchpad.net/${PN}/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+dbus nls static-libs test +threads"
-
-RDEPEND="dbus? ( dev-libs/expat >=sys-apps/dbus-1.2.16 )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( dev-util/valgrind )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.0.3-optional-dbus.patch
-	epatch "${FILESDIR}"/${PN}-1.0.3-pkg-config.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with dbus) \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		$(use_enable threads) \
-		$(use_enable threads threading)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	# we need to be in / because upstart needs libnih
-	gen_usr_ldscript -a nih $(use dbus && echo nih-dbus)
-	use static-libs || rm "${D}"/usr/lib*/*.la
-
-	dodoc AUTHORS ChangeLog HACKING NEWS README TODO
-}