From c0b9e2e92c9549415dcb0e3a24f1b7804e398766 Mon Sep 17 00:00:00 2001
From: Ian Whyman <thev00d00@gentoo.org>
Date: Sat, 16 Dec 2017 10:27:11 +0000
Subject: net-libs/libupnp: Fix pkgconfig slotting #640422

Package-Manager: Portage-2.3.18, Repoman-2.3.6
---
 net-libs/libupnp/libupnp-1.8.3-r1.ebuild | 72 ++++++++++++++++++++++++++++++++
 net-libs/libupnp/libupnp-1.8.3.ebuild    | 70 -------------------------------
 2 files changed, 72 insertions(+), 70 deletions(-)
 create mode 100644 net-libs/libupnp/libupnp-1.8.3-r1.ebuild
 delete mode 100644 net-libs/libupnp/libupnp-1.8.3.ebuild

(limited to 'net-libs')

diff --git a/net-libs/libupnp/libupnp-1.8.3-r1.ebuild b/net-libs/libupnp/libupnp-1.8.3-r1.ebuild
new file mode 100644
index 000000000000..1f618d7ad3de
--- /dev/null
+++ b/net-libs/libupnp/libupnp-1.8.3-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic autotools vcs-snapshot
+
+DESCRIPTION="An Portable Open Source UPnP Development Kit"
+HOMEPAGE="http://pupnp.sourceforge.net/"
+SRC_URI="https://github.com/mrjimenez/pupnp/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="1.8"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="blocking-tcp debug doc ipv6 +reuseaddr samples static-libs"
+
+DOCS="NEWS ChangeLog"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.19-docs-install.patch
+	"${FILESDIR}"/${PN}-1.6.21-cflags.patch
+)
+
+src_prepare() {
+	default
+
+	# fix tests
+	chmod +x ixml/test/test_document.sh || die
+
+	eautoreconf
+}
+
+src_configure() {
+	use x86-fbsd &&	append-flags -O1
+	# w/o docdir to avoid sandbox violations
+	econf $(use_enable debug) \
+		$(use_enable blocking-tcp blocking-tcp-connections) \
+		$(use_enable ipv6) \
+		$(use_enable reuseaddr) \
+		$(use_enable static-libs static) \
+		$(use_enable samples) \
+		$(use_with doc documentation "${EPREFIX}/usr/share/doc/${PF}")
+}
+
+src_install () {
+	default
+
+	use static-libs || prune_libtool_files
+
+	# Slot samples
+	if $(use samples); then
+		for bin in combo ctrlpt device ; do
+			newbin "upnp/sample/.libs/tv_$bin" "tv_$bin-${SLOT}"
+		done
+	fi
+
+	# Slot includes
+	cd "${D}/usr/include" || die
+	mv upnp "upnp-${SLOT}" || die
+
+	# Slot pkgconfig
+	cd "${D}/usr/$(get_libdir)/pkgconfig" || die
+	mv libupnp.pc "libupnp-${SLOT}.pc" || die
+	sed -i -e "s#/upnp#/upnp-${SLOT}#" \
+		-e "s#lupnp#lupnp-${SLOT}#" \
+		-e "s#lixml#lixml-${SLOT}#" "libupnp-${SLOT}.pc" || die
+
+	# Slot symlinks
+	cd "${D}/usr/$(get_libdir)" || die
+	mv libupnp.so "libupnp-${SLOT}.so" || die
+	mv libixml.so "libixml-${SLOT}.so" || die
+}
diff --git a/net-libs/libupnp/libupnp-1.8.3.ebuild b/net-libs/libupnp/libupnp-1.8.3.ebuild
deleted file mode 100644
index 1de9d5f72d47..000000000000
--- a/net-libs/libupnp/libupnp-1.8.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic autotools vcs-snapshot
-
-DESCRIPTION="An Portable Open Source UPnP Development Kit"
-HOMEPAGE="http://pupnp.sourceforge.net/"
-SRC_URI="https://github.com/mrjimenez/pupnp/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="1.8"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="blocking-tcp debug doc ipv6 +reuseaddr samples static-libs"
-
-DOCS="NEWS ChangeLog"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.19-docs-install.patch
-	"${FILESDIR}"/${PN}-1.6.21-cflags.patch
-)
-
-src_prepare() {
-	default
-
-	# fix tests
-	chmod +x ixml/test/test_document.sh || die
-
-	eautoreconf
-}
-
-src_configure() {
-	use x86-fbsd &&	append-flags -O1
-	# w/o docdir to avoid sandbox violations
-	econf $(use_enable debug) \
-		$(use_enable blocking-tcp blocking-tcp-connections) \
-		$(use_enable ipv6) \
-		$(use_enable reuseaddr) \
-		$(use_enable static-libs static) \
-		$(use_enable samples) \
-		$(use_with doc documentation "${EPREFIX}/usr/share/doc/${PF}")
-}
-
-src_install () {
-	default
-
-	use static-libs || prune_libtool_files
-
-	# Slot samples
-	if $(use samples); then
-		for bin in combo ctrlpt device ; do
-			newbin "upnp/sample/.libs/tv_$bin" "tv_$bin-${SLOT}"
-		done
-	fi
-
-	# Slot includes
-	cd "${D}/usr/include" || die
-	mv upnp "upnp-${SLOT}" || die
-
-	# Slot pkgconfig
-	cd "${D}/usr/$(get_libdir)/pkgconfig" || die
-	mv libupnp.pc "libupnp-${SLOT}.pc" || die
-	sed -i "s#/upnp#/upnp-${SLOT}#" "libupnp-${SLOT}.pc" || die
-
-	# Slot symlinks
-	cd "${D}/usr/$(get_libdir)" || die
-	mv libupnp.so "libupnp-${SLOT}.so" || die
-	mv libixml.so "libixml-${SLOT}.so" || die
-}
-- 
cgit v1.2.3-65-gdbad