remove old version

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x30C46538

3 files changed, 8 insertions, 205 deletions

diff --git a/sys-apps/kmod/ChangeLog b/sys-apps/kmod/ChangeLog
index 784bd4c2c598..66afa2c52879 100644
--- a/sys-apps/kmod/ChangeLog
+++ b/sys-apps/kmod/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/kmod
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.184 2015/03/02 18:17:36 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.185 2015/03/19 17:08:21 williamh Exp $
+
+  19 Mar 2015; William Hubbs <williamh@gentoo.org> -kmod-18-r2.ebuild:
+  remove old version
 
 *kmod-20 (02 Mar 2015)
 
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index 2d673847c38c..bf4b86c7ac32 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -8,16 +8,15 @@ DIST kmod-18.tar.xz 1473904 SHA256 e16e57272b54acb219c465b334715cfdddb5d97ff5d89
 DIST kmod-19.tar.xz 1473916 SHA256 3e7fee6eeff5435848b2dcc852bc8959066478d687d232284d67300c071e7b14 SHA512 317aebbfe12e2bd8f610d799642499d411e017cbda6082d0de92b1597753d29f42c4a2faac574879166e8cda8d7fd42ad2f98086b169e85b238cf024887ec0ee WHIRLPOOL a2aec8057cbc7776b71cea5c70fcec90fa20f09d2195f532f03085df2e85ae6dfbba50450a1b33425fd17caa01b997e052ec4676e0ed9c6afd7555b53aa8c589
 DIST kmod-20.tar.xz 437880 SHA256 89c1a1a2193c31f9ebe582640bfa2bd401341dc24119f5a7f702588116fadaa0 SHA512 1026d80486e6c823fc74a439d15a8b1e4a501140f67568165904b43a73130133d6c84075ec8a7981a5d4a187d5fbd21afd197de4e81cc05a66506711865edf96 WHIRLPOOL 938d1ea4d153c04231b89701c7a7f602d31166e5c85bb6f2798ba0a7c22a4961f05bdd8631d985785212e5bf359d1cd12c4088fd9c2a07d8b6b9a77599e84a39
 EBUILD kmod-18-r1.ebuild 5239 SHA256 bb154ec79a7dd1517c0ac71fc029e9cfac3e7040f3a2eec1ed1fc2351f2a07cd SHA512 219df6833bac123add666502fc962401d79567b115675d8faba37a1955e0ce286f2b12640c99631b504d562c471a91f96a95e79067b3f26f9a3bf71c230c2c33 WHIRLPOOL 83077d86079416d806128b62b42e3c35b2ae0f0b11a94d5979290b130043150a750d30d5bc154daf60a4898bd748a84917a4d42fdaf5f4896def4729e5d94e3c
-EBUILD kmod-18-r2.ebuild 5349 SHA256 4236e7a3b0f1dcc3c47053345e9f0b0ff201bda13a8394d33cc07749f08a4f0f SHA512 3591b376c551229e635177c367f98fa26e97ba46f80ed31d954cb2a2691d012b71a6d06c3a3834ba7a39891b8161ec7c5cb4979753dc2863bf6c48ef960798e0 WHIRLPOOL 0f808f4d8f9169cb861d7a7173abddfebfbf2908e74442c2a52e6fa972fe6b49b0932bccbeb5ed54f36ce79abfa1c9d24818ce1469aec5d3ec9b7cd94edee6e7
 EBUILD kmod-19.ebuild 5024 SHA256 800452d40009fe15fd78099897cea46f41c29dd4784f343468b2790cc4668170 SHA512 645c86d4e6682f9b0013978b41b117f2d45f4c08c6fe6266861c2e90911a09f33324ada6f698236806f98edcad0e13a172a3d2f0536f4d435bd5180bae3634f4 WHIRLPOOL 4e2cf48ebe78f66c1e3aea761f9d7479ef8f2d7d41f86ff75da7a1f1ac4d6aec1daa0092b85cd1a947b1cd31113c567cafa4fb87f316385f15121798f7a0ee69
 EBUILD kmod-20.ebuild 5030 SHA256 964b7e624b248622d307f411a343d5de9b27f4d7ac9290be6d8d11454d8cde37 SHA512 662804e2eda0aa4bd578be09f0c5dcdbd3f0714a9e636a6ca2d58e6f66066a20aeb072628593845210c0044e0bb4f7d793a9dc5805612cdf8cefb6854131d3c4 WHIRLPOOL 1f74c05ab698a139246f826456b4b99c4cdf8fbae35bcc8a4775448bee9721a71a99098ab0625a9297144b74d98291b5735a18e604db02eaae327437a7cc4f4a
 EBUILD kmod-9999.ebuild 5033 SHA256 6d77601325de070a2c5d9c881f7812d76a40d13297e75e70fa183d77a7fec848 SHA512 c4042971a3057202cd86266cad73948f611de1b10176b7c61cdb874c54557e1622297aa3923f8adb95afbc034fea5ae1e7f788e5727afd051a8d6886a966d411 WHIRLPOOL 4bfbf3b33b39f7299df41583dee90d659f47e808aafca08250e2f2e020a7740cdec067f062a14e83b303da55854dc67c1099e8e4b492820958fc6de145134959
-MISC ChangeLog 26433 SHA256 d77e562eeb68361c657f4324f37d18d51d595da77f88300ec1589aee948d6f03 SHA512 dc40e11374fcdcff2ac958661af14ecb33c4f61750a5b7afb8230d7e4b47a94311d5bfe1e75036a27543a218cd99c85f268872b948d32f8803575c54019ca3ec WHIRLPOOL 068714808e0568730b3d7493290ce6563cfe7c448647fde8bcea6fdb539086f28f97589c3fe120fa0f0e04546e5b0efac43ceb541f50801c94fbfba4e4a43fe8
+MISC ChangeLog 26526 SHA256 fd613a58b5d973f6acb107c503f306ff24838cd20e0319943e4175bbf62e10cc SHA512 0e0157b7be3d95856e726643b46fe2f634c4457d54d86226203c0de3e12e4d8bb13e37a43bf8f45f19dab6ceaf8a4acf590578f3735ca62665f00eac8d903d19 WHIRLPOOL aa185b6ee8347c094fdb4776ed6cd4d105b9869e8b574990757f8804edb18620f8ce734821f970dc8113d2b1c633716b2cc304242d7b294df72a4b08355c0f2f
 MISC metadata.xml 315 SHA256 615f47d63e08942e7a0c3cd3246f70d2f49b276aec75c84a9ec5e1188a91a18e SHA512 0f8bb9e3ba70ec5084d3c8a3fe8fba508dec2a33cb77cc13f3aba35c70b53d9011674a862033de6ba83aefb1b351b4d1fac7112d2e61070444620191f8ed8742 WHIRLPOOL 928f3536c928ba3457a2f94eb6de26e3c13f5a34748d554219edd8aa5841c24ebbc5930fcb147550c0cd9d8f5eae8f4a1cd04f3267ddbe066450178e38d7cb37
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlT0qUcACgkQblQW9DDEZTjEhQCePT9jANFB3FNqMmvoXJkxIu+m
-SIMAnR2SVYOsTIE2wkSOTxumQ7c60LiZ
-=U2jH
+iEYEAREIAAYFAlULAosACgkQblQW9DDEZTg9VwCguI+1sygaq55SC29tGgYqF4tD
+aCkAn3DURF9w4GESyw+XqwHR8OggIVwR
+=VLEh
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/kmod/kmod-18-r2.ebuild b/sys-apps/kmod/kmod-18-r2.ebuild
deleted file mode 100644
index 0b409e6a591a..000000000000
--- a/sys-apps/kmod/kmod-18-r2.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-18-r2.ebuild,v 1.4 2015/01/18 18:34:30 floppym Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
-
-inherit bash-completion-r1 eutils multilib python-r1
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
-	inherit autotools git-2
-else
-	SRC_URI="mirror://kernel/linux/utils/kernel/kmod/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-	inherit libtool
-fi
-
-DESCRIPTION="library and tools for managing linux kernel modules"
-HOMEPAGE="http://git.kernel.org/?p=utils/kernel/kmod/kmod.git"
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="debug doc lzma python static-libs +tools zlib"
-
-# Upstream does not support running the test suite with custom configure flags.
-# I was also told that the test suite is intended for kmod developers.
-# So we have to restrict it.
-# See bug #408915.
-RESTRICT="test"
-
-# Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch
-RDEPEND="!sys-apps/module-init-tools
-	!sys-apps/modutils
-	!<sys-apps/openrc-0.13
-	!<sys-apps/systemd-216-r3
-	lzma? ( >=app-arch/xz-utils-5.0.4-r1 )
-	python? ( ${PYTHON_DEPS} )
-	zlib? ( >=sys-libs/zlib-1.2.6 )" #427130
-DEPEND="${RDEPEND}
-	doc? ( dev-util/gtk-doc )
-	lzma? ( virtual/pkgconfig )
-	python? (
-		dev-python/cython[${PYTHON_USEDEP}]
-		virtual/pkgconfig
-		)
-	zlib? ( virtual/pkgconfig )"
-if [[ ${PV} == 9999* ]]; then
-	DEPEND="${DEPEND}
-		dev-libs/libxslt"
-fi
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DOCS="NEWS README TODO"
-
-src_prepare() {
-	if [ ! -e configure ]; then
-		if use doc; then
-			gtkdocize --copy --docdir libkmod/docs || die
-		else
-			touch libkmod/docs/gtk-doc.make
-		fi
-		eautoreconf
-	else
-		epatch "${FILESDIR}"/${PN}-15-dynamic-kmod.patch #493630
-		elibtoolize
-	fi
-
-	epatch "${FILESDIR}"/${P}-static-nodes-indicate-that-creation-of-static-nodes-.patch
-
-	# Restore possibility of running --enable-static wrt #472608
-	sed -i \
-		-e '/--enable-static is not supported by kmod/s:as_fn_error:echo:' \
-		configure || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}/bin"
-		--with-rootlibdir="${EPREFIX}/$(get_libdir)"
-		--enable-shared
-		$(use_enable static-libs static)
-		$(use_enable tools)
-		$(use_enable debug)
-		$(use_enable doc gtk-doc)
-		$(use_with lzma xz)
-		$(use_with zlib)
-		--with-bashcompletiondir="$(get_bashcompdir)"
-	)
-
-	local ECONF_SOURCE="${S}"
-
-	kmod_configure() {
-		mkdir -p "${BUILD_DIR}" || die
-		run_in_build_dir econf "${myeconfargs[@]}" "$@"
-	}
-
-	BUILD_DIR="${WORKDIR}/build"
-	kmod_configure --disable-python
-
-	if use python; then
-		python_parallel_foreach_impl kmod_configure --enable-python
-	fi
-}
-
-src_compile() {
-	if [[ ${PV} != 9999* ]]; then
-		# Force -j1 because of -15-dynamic-kmod.patch, likely caused by lack of eautoreconf
-		# wrt #494806
-		local MAKEOPTS="${MAKEOPTS} -j1"
-	fi
-
-	emake -C "${BUILD_DIR}"
-
-	if use python; then
-		local native_builddir=${BUILD_DIR}
-
-		python_compile() {
-			emake -C "${BUILD_DIR}" -f Makefile -f - python \
-				VPATH="${native_builddir}:${S}" \
-				native_builddir="${native_builddir}" \
-				libkmod_python_kmod_{kmod,list,module,_util}_la_LIBADD='$(PYTHON_LIBS) $(native_builddir)/libkmod/libkmod.la' \
-				<<< 'python: $(pkgpyexec_LTLIBRARIES)'
-		}
-
-		python_foreach_impl python_compile
-	fi
-}
-
-src_install() {
-	emake -C "${BUILD_DIR}" DESTDIR="${D}" install
-	einstalldocs
-
-	if use python; then
-		local native_builddir=${BUILD_DIR}
-
-		python_install() {
-			emake -C "${BUILD_DIR}" DESTDIR="${D}" \
-				VPATH="${native_builddir}:${S}" \
-				install-pkgpyexecLTLIBRARIES \
-				install-dist_pkgpyexecPYTHON
-		}
-
-		python_foreach_impl python_install
-	fi
-
-	prune_libtool_files --modules
-
-	if use tools; then
-		local bincmd sbincmd
-		for sbincmd in depmod insmod lsmod modinfo modprobe rmmod; do
-			dosym /bin/kmod /sbin/${sbincmd}
-		done
-
-		# These are also usable as normal user
-		for bincmd in lsmod modinfo; do
-			dosym kmod /bin/${bincmd}
-		done
-	fi
-
-	cat <<-EOF > "${T}"/usb-load-ehci-first.conf
-	softdep uhci_hcd pre: ehci_hcd
-	softdep ohci_hcd pre: ehci_hcd
-	EOF
-
-	insinto /lib/modprobe.d
-	doins "${T}"/usb-load-ehci-first.conf #260139
-
-	newinitd "${FILESDIR}"/kmod-static-nodes-r1 kmod-static-nodes
-}
-
-pkg_postinst() {
-	if [[ -L ${EROOT%/}/etc/runlevels/boot/static-nodes ]]; then
-		ewarn "Removing old conflicting static-nodes init script from the boot runlevel"
-		rm -f "${EROOT%/}"/etc/runlevels/boot/static-nodes
-	fi
-
-	# Add kmod to the runlevel automatically if this is the first install of this package.
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		if [[ ! -d ${EROOT%/}/etc/runlevels/sysinit ]]; then
-			mkdir -p "${EROOT%/}"/etc/runlevels/sysinit
-		fi
-		if [[ -x ${EROOT%/}/etc/init.d/kmod-static-nodes ]]; then
-			ln -s /etc/init.d/kmod-static-nodes "${EROOT%/}"/etc/runlevels/sysinit/kmod-static-nodes
-		fi
-	fi
-
-	if [[ -e ${EROOT%/}/etc/runlevels/sysinit ]]; then
-		if [[ ! -e ${EROOT%/}/etc/runlevels/sysinit/kmod-static-nodes ]]; then
-			ewarn
-			ewarn "You need to add kmod-static-nodes to the sysinit runlevel for"
-			ewarn "kernel modules to have required static nodes!"
-			ewarn "Run this command:"
-			ewarn "\trc-update add kmod-static-nodes sysinit"
-		fi
-	fi
-}