[gentoo-commits] repo/gentoo:master commit in: app-portage/gentoolkit-dev/files/, profiles/, app-portage/gentoolkit-dev/

[gentoo-commits] repo/gentoo:master commit in: app-portage/gentoolkit-dev/files/, profiles/, app-portage/gentoolkit-dev/

[Michał Górny]

commit:     6958c3f95619c228c1617cdae9838ae4cbc94171
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 11 13:36:10 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Dec 11 13:36:10 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6958c3f9

app-portage/gentoolkit-dev: Remove last-rited pkg

Closes: https://bugs.gentoo.org/659412
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 app-portage/gentoolkit-dev/Manifest                |  3 -
 .../files/gentoolkit-dev-0.2.8.3-tests.patch       | 25 -------
 .../gentoolkit-dev-0.2.8.3-r1.ebuild               | 57 --------------
 .../gentoolkit-dev/gentoolkit-dev-0.3.0.ebuild     | 86 ---------------------
 .../gentoolkit-dev/gentoolkit-dev-0.3.1.ebuild     | 87 ----------------------
 app-portage/gentoolkit-dev/metadata.xml            | 11 ---
 profiles/package.mask                              |  4 -
 7 files changed, 273 deletions(-)

diff --git a/app-portage/gentoolkit-dev/Manifest b/app-portage/gentoolkit-dev/Manifest
deleted file mode 100644
index 3f767069b9e..00000000000
--- a/app-portage/gentoolkit-dev/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gentoolkit-dev-0.2.8.3.tar.gz 53322 BLAKE2B 65136a748a971688371245a5bc46d9d45689c14fdb0a772c0d2a94264cec4464c90345b9d089b855acae91db92b08b604400ada09ffb2c08f77bb3662ea952b3 SHA512 f55362e46928633598cb07640505202521e3f4bdaade1faecb4ac14ba1bee0489207cb7ab03531e06d7922446a57083365f51c63ceb8cf1e0badba9ac503c16e
-DIST gentoolkit-dev-0.3.0.tar.gz 58655 BLAKE2B 5784ed2b2c6f92f2b6bf4a0d3d4a61d2f9defe20c438d273c5a89ed7b980afec08dd70fabc787066acd2aeea4ee5fdd6127d42cc500aacd8dcbd690ff7124d63 SHA512 d15f6546cf88af0832c14eb003c72b5906bb9b9f078c903e1e444b12c2e432fd1a2fa077eda5496e222cb50cfd5a705e86044b9a1c0164ac6b4b38268461ced5
-DIST gentoolkit-dev-0.3.1.tar.gz 58472 BLAKE2B 33ad722d23abfa94fcc73dd505794cde935119aafa8ae6f2828b59e6f1e95c00dcbb751732f69327d2278751350fb2aa25e3f7c2a33cf35367b10edad5744193 SHA512 e47fa698710132914c2de6d25f7450b90383b9d6283e927221bec30be3a56de93c09e81c35e025dee2f01bd5c2f10cf231fc392c415849029529712cd81aea19

diff --git a/app-portage/gentoolkit-dev/files/gentoolkit-dev-0.2.8.3-tests.patch b/app-portage/gentoolkit-dev/files/gentoolkit-dev-0.2.8.3-tests.patch
deleted file mode 100644
index 533491d7689..00000000000
--- a/app-portage/gentoolkit-dev/files/gentoolkit-dev-0.2.8.3-tests.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 2da4232cfd9597b829dda4bcfbf3aab25f243950 Mon Sep 17 00:00:00 2001
-From: Christian Ruppert <idl0r@gentoo.org>
-Date: Sat, 11 May 2013 23:56:25 +0200
-Subject: [PATCH] Fix echangelog test
-
----
- src/echangelog/test/test.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/echangelog/test/test.sh b/src/echangelog/test/test.sh
-index 0559113..53bb0b5 100755
---- a/src/echangelog/test/test.sh
-+++ b/src/echangelog/test/test.sh
-@@ -160,7 +160,7 @@ ebegin "Preparing echangelog"
- 
- if [ -e "../echangelog" ]; then
- 	cp ../echangelog "${_ROOT}/tmp" || set $?
--	sed -i -e 's:use POSIX qw.*:use POSIX qw(setlocale getcwd);\nuse TEST qw(strftime);:' "${_ROOT}/tmp/echangelog" || set $?
-+	sed -i -e 's:use POSIX qw.*:use POSIX qw(locale_h setlocale getcwd);\nuse TEST qw(strftime);:' "${_ROOT}/tmp/echangelog" || set $?
- 	eend ${1:-0} || exit ${1}
- else
- 	eerror "error"
--- 
-1.8.1.5
-

diff --git a/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.8.3-r1.ebuild b/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.8.3-r1.ebuild
deleted file mode 100644
index 871c6d5c425..00000000000
--- a/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.8.3-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-PYTHON_REQ_USE="xml"
-
-inherit python-r1 eutils
-
-DESCRIPTION="Collection of developer scripts for Gentoo"
-HOMEPAGE="https://www.gentoo.org/proj/en/portage/tools/index.xml"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-CDEPEND="
-	sys-apps/portage[${PYTHON_USEDEP}]
-	dev-lang/perl
-	sys-apps/diffutils"
-DEPEND="${PYTHON_DEPS}
-	!>=app-portage/gentoolkit-0.4.0
-	test? ( ${CDEPEND} )"
-RDEPEND="${PYTHON_DEPS}
-	${CDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-tests.patch"
-}
-
-src_test() {
-	# echangelog test is not able to run as root
-	# the EUID check may not work for everybody
-	if [[ ${EUID} -ne 0 ]];
-	then
-		python_foreach_impl emake test
-	else
-		ewarn "test skipped, please re-run as non-root if you wish to test ${PN}"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-	python_replicate_script "${ED}"/usr/bin/imlate
-}
-
-pkg_postinst() {
-	ewarn "This package is deprecated.  ebump, ekeyword and imlate have "
-	ewarn "been moved to >=app-portage/gentoolkit-0.4.0"
-	ewarn "The remaining gentoolkit-dev commands are considered deprecated"
-}

diff --git a/app-portage/gentoolkit-dev/gentoolkit-dev-0.3.0.ebuild b/app-portage/gentoolkit-dev/gentoolkit-dev-0.3.0.ebuild
deleted file mode 100644
index c270ccd256b..00000000000
--- a/app-portage/gentoolkit-dev/gentoolkit-dev-0.3.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-PYTHON_REQ_USE="xml"
-
-inherit python-r1
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/gentoolkit.git
-		https://anongit.gentoo.org/git/proj/gentoolkit.git"
-	EGIT_BRANCH="gentoolkit-dev"
-else
-	SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Collection of developer scripts for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-CDEPEND="
-	sys-apps/portage[${PYTHON_USEDEP}]
-	dev-lang/perl
-	sys-apps/diffutils"
-DEPEND="${PYTHON_DEPS}
-	!>=app-portage/gentoolkit-0.4.0
-	test? ( ${CDEPEND} )"
-RDEPEND="${PYTHON_DEPS}
-	${CDEPEND}"
-
-src_prepare() {
-	if [[ -n ${EPREFIX} ]] ; then
-		# fix shebangs of scripts
-		local d p
-		ebegin "Fixing shebangs"
-		for d in src/* ; do
-			p=${d#*/}
-			sed -i \
-				-e "1s:\(\(/usr\)\?/bin/\):${EPREFIX}\1:" \
-				${d}/${p}* \
-				|| die "failed to fix ${d}/${p}"
-		done
-		eend $?
-
-		# fix repo location
-		sed -i \
-			-e "s:portage\.db\['/'\]:portage.db['${EPREFIX}/']:g" \
-			src/ekeyword/ekeyword.py \
-			|| die "failed to set EPREFIX in ekeyword"
-		# fix repo name
-		sed -i \
-			-e "s:repo='gentoo':repo='gentoo_prefix':g" \
-			src/ekeyword/ekeyword.py \
-			|| die "failed to set correct reponame in ekeyword"
-	fi
-}
-
-src_test() {
-	# echangelog test is not able to run as root
-	# the EUID check may not work for everybody
-	if [[ ${EUID} -ne 0 ]]; then
-		python_foreach_impl emake test
-	else
-		ewarn "test skipped, please re-run as non-root if you wish to test ${PN}"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-	python_replicate_script "${ED}"/usr/bin/{ekeyword,imlate}
-}
-
-pkg_postinst() {
-	ewarn "This package is deprecated.  ebump, ekeyword and imlate have "
-	ewarn "been moved to >=app-portage/gentoolkit-0.4.0"
-	ewarn "The remaining gentoolkit-dev commands are considered deprecated"
-}

diff --git a/app-portage/gentoolkit-dev/gentoolkit-dev-0.3.1.ebuild b/app-portage/gentoolkit-dev/gentoolkit-dev-0.3.1.ebuild
deleted file mode 100644
index bef715e4fdb..00000000000
--- a/app-portage/gentoolkit-dev/gentoolkit-dev-0.3.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-PYTHON_REQ_USE="xml"
-
-inherit python-r1
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/gentoolkit.git
-		https://anongit.gentoo.org/git/proj/gentoolkit.git"
-	EGIT_BRANCH="gentoolkit-dev"
-else
-	SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.gz
-		https://dev.gentoo.org/~vapier/dist/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Collection of developer scripts for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-CDEPEND="
-	sys-apps/portage[${PYTHON_USEDEP}]
-	dev-lang/perl
-	sys-apps/diffutils"
-DEPEND="${PYTHON_DEPS}
-	!>=app-portage/gentoolkit-0.4.0
-	test? ( ${CDEPEND} )"
-RDEPEND="${PYTHON_DEPS}
-	${CDEPEND}"
-
-src_prepare() {
-	if [[ -n ${EPREFIX} ]] ; then
-		# fix shebangs of scripts
-		local d p
-		ebegin "Fixing shebangs"
-		for d in src/* ; do
-			p=${d#*/}
-			sed -i \
-				-e "1s:\(\(/usr\)\?/bin/\):${EPREFIX}\1:" \
-				${d}/${p}* \
-				|| die "failed to fix ${d}/${p}"
-		done
-		eend $?
-
-		# fix repo location
-		sed -i \
-			-e "s:portage\.db\['/'\]:portage.db['${EPREFIX}/']:g" \
-			src/ekeyword/ekeyword.py \
-			|| die "failed to set EPREFIX in ekeyword"
-		# fix repo name
-		sed -i \
-			-e "s:repo='gentoo':repo='gentoo_prefix':g" \
-			src/ekeyword/ekeyword.py \
-			|| die "failed to set correct reponame in ekeyword"
-	fi
-}
-
-src_test() {
-	# echangelog test is not able to run as root
-	# the EUID check may not work for everybody
-	if [[ ${EUID} -ne 0 ]]; then
-		python_foreach_impl emake test
-	else
-		ewarn "test skipped, please re-run as non-root if you wish to test ${PN}"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-	python_replicate_script "${ED}"/usr/bin/{ekeyword,imlate}
-}
-
-pkg_postinst() {
-	ewarn "This package is deprecated.  ebump, ekeyword and imlate have "
-	ewarn "been moved to >=app-portage/gentoolkit-0.4.0"
-	ewarn "The remaining gentoolkit-dev commands are considered deprecated"
-}

diff --git a/app-portage/gentoolkit-dev/metadata.xml b/app-portage/gentoolkit-dev/metadata.xml
deleted file mode 100644
index 411cabb0fb0..00000000000
--- a/app-portage/gentoolkit-dev/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>tools-portage@gentoo.org</email>
-		<name>Gentoo Portage tools team</name>
-	</maintainer>
-	<longdescription>
-		Gentoolkit-dev is a collection of developer tools for the Gentoo distribution.
-	</longdescription>
-</pkgmetadata>

diff --git a/profiles/package.mask b/profiles/package.mask
index a7f0f1fbe0d..f828977aae1 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -227,10 +227,6 @@ dev-lang/gnu-smalltalk
 # in a month.
 dev-db/maatkit
 
-# Pacho Ramos <pacho@gentoo.org> (11 Nov 2018)
-# Merged into >=app-portage/gentoolkit-0.4 (#659412). Removal in a month.
-app-portage/gentoolkit-dev
-
 # Pacho Ramos <pacho@gentoo.org> (11 Nov 2018)
 # Fails to build (#662000), not compatible with kernel-4, use kernel driver rtsx_pci
 # instead. Removal in a month.