gentoo resync : 28.12.2017

3 files changed, 2 insertions, 57 deletions

diff --git a/dev-libs/liblist/Manifest b/dev-libs/liblist/Manifest
index 3739165b016a..5a52eed00da3 100644
--- a/dev-libs/liblist/Manifest
+++ b/dev-libs/liblist/Manifest
@@ -1,5 +1,3 @@
-DIST liblist-2.3.1.tar.bz2 257253 BLAKE2B 3ae30654d39db79e26aacb3f101bf217a7d97dcb8f29f261b0d8840f24a069759fc7d4a1b53d345828b96bdb3c30656a099bef3d1ce29cf6f5608950971414cc SHA512 4bb9cc678bafc3be68f94d028aa9a9a9c9dd792043adc6e7916955afa07b6e94653bd235ee81880307e433e07130823daf1fd36ba0663da7d09e5f4eb84efc6c
 DIST liblist-2.4.tar.bz2 275234 BLAKE2B 2f18d8b85476bd9369ef597553a546450fd33b3f3b4486ca371e6efd810a51b23ca3880300e0ecf826e9a9e8591f2b90a6a0006d224b34552f77416a83f7175e SHA512 814a02e4e47de8d234e592b87156533c30563c64c3a7515712fb9b75119bcee21796232b2a5abf7e4ab892932fa256890ad175aecb75aad8fb4614c6f4fbe3dd
-EBUILD liblist-2.3.1-r1.ebuild 1379 BLAKE2B 6b7c341d478051f4b506c09ef926e833c1a7b1eb0e8946eb2189e8b5f2edbb0f6755c2340676b4dd9486c8c399256ffd2fb952d8ce161d5b7d5b1b43d35cb2a9 SHA512 605425c69136ac9e7445a5056f5aea1acf1afc678301fbc69c70d7c3729252300a679ab0dbacd6cba6e88a6daefb5c0804520f52f37d80adacfe0d24f4b2daa9
-EBUILD liblist-2.4.ebuild 1314 BLAKE2B f3bab86cf0f2a853b248c8de5dd7ef125f05c481d8a90ff9d9412a1eac2cb1cfb2a877f600af84d62be6ab1740ded36043262baa0b6af5d6111f38ef455ab4fa SHA512 30bb549fbcdd4a8846669bbb779faf765b2e1f2726d605dbbe7866dd207c2accc5d51663865f61a46c39b41882644eaed5ba3de6849a9d88a8721634568cfefb
+EBUILD liblist-2.4.ebuild 1313 BLAKE2B be3464f685e9699c9ec98c67bf6874597700a73193eaad4f31c893c554a92d04b13943d6f911500899f72091d3a1f5508a60520d29727ceb108fe4bfb30c35a0 SHA512 9a6dc3507516c4f138544a702328ac2b7360cfdf86295751f913299670b00e8f13e1cd15a8baf0e235ce45050415cc8a2c64d79eb7b33ff42b6be06c03c42bbc
 MISC metadata.xml 329 BLAKE2B cfab16b6b8ca6091ab9be14dd10c450705a04efa707d7ce91fe695502929bdf91140af0b9a898c28d9b4b3236bf5bcc35222e367234575bd61ac160c6c29d0a2 SHA512 4e63a82dc13d3606b920b15ebc720ff19ea775dd6d37f494166ab89c23013cb5610b747063e768f7959c83bac48ab11f69233304f1e3314845e94fbe053fae71
diff --git a/dev-libs/liblist/liblist-2.3.1-r1.ebuild b/dev-libs/liblist/liblist-2.3.1-r1.ebuild
deleted file mode 100644
index 325032cde687..000000000000
--- a/dev-libs/liblist/liblist-2.3.1-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-
-inherit multilib
-
-DESCRIPTION="Generic linked-list manipulation routines, plus queues and stacks"
-HOMEPAGE="http://ohnopub.net/liblist"
-SRC_URI="ftp://ohnopublishing.net/mirror/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux"
-IUSE="doc examples static-libs"
-
-DEPEND="doc? ( media-gfx/transfig
-	dev-texlive/texlive-metapost
-	virtual/latex-base )"
-
-src_configure() {
-	econf --docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		$(use_enable doc docs) \
-		$(use_enable examples) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc README || die
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/{*.c,Makefile,README} || die
-		insinto /usr/share/doc/${PF}/examples/cache
-		doins examples/cache/{*.c,README} || die
-	fi
-
-	if ! use static-libs; then
-		rm -v "${ED}"/usr/$(get_libdir)/liblist.la || die
-		if use examples; then
-			rm -v "${ED}"/usr/$(get_libdir)/libcache.la || die
-		fi
-	fi
-}
-
-pkg_postinst() {
-	elog "Note the man pages for this package have been renamed to avoid"
-	elog "name collisions with some system functions, however, the libs"
-	elog "and header files have not been changed."
-	elog "The new names are llist, lcache, lqueue, and lstack."
-}
diff --git a/dev-libs/liblist/liblist-2.4.ebuild b/dev-libs/liblist/liblist-2.4.ebuild
index 7999fd600cfa..0133d56da438 100644
--- a/dev-libs/liblist/liblist-2.4.ebuild
+++ b/dev-libs/liblist/liblist-2.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ohnopublishing.net/mirror/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 x86 ~amd64-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux"
 IUSE="doc examples static-libs"
 
 RDEPEND="doc? ( media-gfx/transfig