Updating liguros repo21.1.2

4 files changed, 5 insertions, 111 deletions

diff --git a/sys-fs/iprutils/Manifest b/sys-fs/iprutils/Manifest
index a26c0a0a0d2a..99301e147982 100644
--- a/sys-fs/iprutils/Manifest
+++ b/sys-fs/iprutils/Manifest
@@ -1,3 +1 @@
-DIST iprutils-2.4.17.1.tar.gz 524770 BLAKE2B eb3864a431193ce342810449bde2ac6a4e7a9c352611077b70f93fd3b3ca69c47cbaf7a55ef45b38f99135acc27ebba34b7fbeb8d7f704587ce96e0a8e1f29bb SHA512 d9b257a1e86350ef26e6491d5030ac864a244283697a4ca588af7ee21c2518c631a2bcfc9913783f973025d186feab8ed045b1d4674621a08b401823e9c52d3d
 DIST iprutils-2.4.18.1.tar.gz 524809 BLAKE2B c32b01ada70e67748653b8e346cdecae35f3ac240a7eaa8be0ff70590bc68b8be770bffe2f3131cbd6cbbe75812f12524c0817aa02674cd4643e846724be2891 SHA512 42da77c0fde0a2650368b2f0605d63762389ab394f755f4e4144704e155333a2ad8133731244b8383e9a334517aca45f62487229a27a2e90cf22a10c760aab3d
-DIST iprutils-2.4.7.tar.gz 467671 BLAKE2B 8ca3e77f927dcb3cd45b78e1b5e15d7edc67b3fbc8762383e0e9e84ebd42ce74927909aae926762d6bf0378d3b8d8f77cece65bb3ace746f889fbebb7fdcbf43 SHA512 9e6fd37cb72ce1d092b02f1cdfeb9e97962007327f92f4d9dd2a755489dab3a5d51a459d2f256d8453de74935a5cee8f25f71a820d82347ae67aa72a89043a91
diff --git a/sys-fs/iprutils/iprutils-2.4.17.1.ebuild b/sys-fs/iprutils/iprutils-2.4.17.1.ebuild
deleted file mode 100644
index b01907f61432..000000000000
--- a/sys-fs/iprutils/iprutils-2.4.17.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools bash-completion-r1 eutils ltprune toolchain-funcs
-
-DESCRIPTION="IBM's tools for support of the ipr SCSI controller"
-SRC_URI="mirror://sourceforge/iprdd/${P}.tar.gz"
-HOMEPAGE="https://sourceforge.net/projects/iprdd/"
-
-SLOT="0"
-LICENSE="IBM"
-KEYWORDS="~ppc ~ppc64"
-IUSE="static-libs"
-
-IPRUTILS_DEPEND="
-	>=sys-libs/ncurses-5.4-r5:=
-	>=sys-apps/pciutils-2.1.11-r1
-"
-RDEPEND="
-	${IPRUTILS_DEPEND}
-	virtual/logger
-	virtual/udev
-"
-DEPEND="
-	${IPRUTILS_DEPEND}
-	virtual/pkgconfig
-"
-PATCHES=(
-		"${FILESDIR}"/${PN}-2.4.8-tinfo.patch
-		"${FILESDIR}"/${PN}-2.4.11.1-basename.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		bashcompdir=$(get_bashcompdir) install
-
-	newinitd "${FILESDIR}"/iprinit-r1 iprinit
-	newinitd "${FILESDIR}"/iprupdate-r1 iprupdate
-	newinitd "${FILESDIR}"/iprdump-r1 iprdump
-
-	prune_libtool_files
-}
diff --git a/sys-fs/iprutils/iprutils-2.4.18.1.ebuild b/sys-fs/iprutils/iprutils-2.4.18.1.ebuild
index b1595889fdb3..abd37a998769 100644
--- a/sys-fs/iprutils/iprutils-2.4.18.1.ebuild
+++ b/sys-fs/iprutils/iprutils-2.4.18.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools bash-completion-r1 eutils ltprune toolchain-funcs
+EAPI=7
+inherit autotools bash-completion-r1
 
 DESCRIPTION="IBM's tools for support of the ipr SCSI controller"
 SRC_URI="mirror://sourceforge/iprdd/${P}.tar.gz"
@@ -11,7 +11,7 @@ HOMEPAGE="https://sourceforge.net/projects/iprdd/"
 SLOT="0"
 LICENSE="IBM"
 KEYWORDS="ppc ppc64"
-IUSE="static-libs"
+IUSE=""
 
 IPRUTILS_DEPEND="
 	>=sys-libs/ncurses-5.4-r5:=
@@ -27,8 +27,8 @@ DEPEND="
 	virtual/pkgconfig
 "
 PATCHES=(
-		"${FILESDIR}"/${PN}-2.4.8-tinfo.patch
-		"${FILESDIR}"/${PN}-2.4.11.1-basename.patch
+	"${FILESDIR}"/${PN}-2.4.8-tinfo.patch
+	"${FILESDIR}"/${PN}-2.4.11.1-basename.patch
 )
 
 src_prepare() {
@@ -37,10 +37,6 @@ src_prepare() {
 	eautoreconf
 }
 
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
 src_install() {
 	emake \
 		DESTDIR="${D}" \
@@ -52,6 +48,4 @@ src_install() {
 	newinitd "${FILESDIR}"/iprinit-r1 iprinit
 	newinitd "${FILESDIR}"/iprupdate-r1 iprupdate
 	newinitd "${FILESDIR}"/iprdump-r1 iprdump
-
-	prune_libtool_files
 }
diff --git a/sys-fs/iprutils/iprutils-2.4.7.ebuild b/sys-fs/iprutils/iprutils-2.4.7.ebuild
deleted file mode 100644
index 7cacccbe3a5c..000000000000
--- a/sys-fs/iprutils/iprutils-2.4.7.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils ltprune toolchain-funcs
-
-DESCRIPTION="IBM's tools for support of the ipr SCSI controller"
-SRC_URI="mirror://sourceforge/iprdd/${P}.tar.gz"
-HOMEPAGE="https://sourceforge.net/projects/iprdd/"
-
-SLOT="0"
-LICENSE="IBM"
-KEYWORDS="ppc ppc64"
-IUSE="static-libs"
-
-DEPEND="
-	>=sys-libs/ncurses-5.4-r5
-	>=sys-apps/pciutils-2.1.11-r1
-	virtual/udev
-"
-RDEPEND="
-	${DEPEND}
-	virtual/logger
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.4.7-tinfo.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/iprinit-r1 iprinit
-	newinitd "${FILESDIR}"/iprupdate-r1 iprupdate
-	newinitd "${FILESDIR}"/iprdump-r1 iprdump
-
-	prune_libtool_files
-}