commit: 1271965ae686c403f2e9051ea6fc7b0f17f17ad0
Author: Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 3 01:48:43 2019 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Tue Dec 3 01:48:43 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1271965a
app-portage/install-mask: drop last-rited pkg
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
app-portage/install-mask/Manifest | 1 -
app-portage/install-mask/files/install-mask.conf | 6 ----
app-portage/install-mask/files/location-db.conf | 18 -----------
app-portage/install-mask/files/location-db.xml | 24 ---------------
app-portage/install-mask/install-mask-0.1.1.ebuild | 25 ----------------
app-portage/install-mask/install-mask-9999.ebuild | 35 ----------------------
app-portage/install-mask/metadata.xml | 16 ----------
profiles/package.mask | 6 ----
8 files changed, 131 deletions(-)
diff --git a/app-portage/install-mask/Manifest
b/app-portage/install-mask/Manifest
deleted file mode 100644
index b1e7c1bf6b9..00000000000
--- a/app-portage/install-mask/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST install-mask-0.1.1.tar.bz2 4241 BLAKE2B
3516f6023efc406076bb3f9189af7b4a647689c6289b4c191d7c05eeb296c14343b9b61e025e5f4ef50ad80982c00dcdd5d133df45b559d2ec5e2db6bf5ea538
SHA512
461f58b4e6fc41bfbe60d713a6d02eec8fe0a4e9ed8a19f8e155174b27f8e3d93c739e2ccce8ab34488ba31649ee585d7b23033dc94f19aa2e3b2033f21f5e79
diff --git a/app-portage/install-mask/files/install-mask.conf
b/app-portage/install-mask/files/install-mask.conf
deleted file mode 100644
index 78b49a47342..00000000000
--- a/app-portage/install-mask/files/install-mask.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# Example /etc/portage/sets.conf adding the @install-mask set.
-
-[install-mask]
-class = portage.sets.shell.CommandOutputSet
-command = install-mask -r
-world-candidate = False
diff --git a/app-portage/install-mask/files/location-db.conf
b/app-portage/install-mask/files/location-db.conf
deleted file mode 100644
index cb050cab37c..00000000000
--- a/app-portage/install-mask/files/location-db.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-[__install-mask__]
-version=1
-
-[systemd]
-path=/usr/lib/systemd/system
-description=systemd unit and auxiliary files.
-
-[bash-completion]
-path=/usr/share/bash-completion
-
-[locale]
-path=/usr/share/locale
-description=All localizations.
-
-[logrotate]
-path=/etc/logrotate.d
-
-# vim:ft=dosini
diff --git a/app-portage/install-mask/files/location-db.xml
b/app-portage/install-mask/files/location-db.xml
deleted file mode 100644
index eea4842e235..00000000000
--- a/app-portage/install-mask/files/location-db.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<install-mask>
- <location id="systemd">
- <path>/usr/lib/systemd/system</path>
- <description>
- systemd unit and auxiliary files.
- </description>
- </location>
-
- <location id="bash-completion">
- <path>/usr/share/bash-completion</path>
- </location>
-
- <location id="locale">
- <path>/usr/share/locale</path>
- <description>
- All localizations.
- </description>
- </location>
-
- <location id="logrotate">
- <path>/etc/logrotate.d</path>
- </location>
-</install-mask>
diff --git a/app-portage/install-mask/install-mask-0.1.1.ebuild
b/app-portage/install-mask/install-mask-0.1.1.ebuild
deleted file mode 100644
index aacd8d8c9db..00000000000
--- a/app-portage/install-mask/install-mask-0.1.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Handle INSTALL_MASK setting in make.conf"
-HOMEPAGE="https://bitbucket.org/mgorny/install-mask/";
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2";
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
-IUSE=""
-
-RDEPEND="app-portage/flaggie[${PYTHON_USEDEP}]"
-
-python_install_all() {
- distutils-r1_python_install_all
-
- insinto /usr/share/portage/config/sets
- newins sets.conf ${PN}.conf
-}
diff --git a/app-portage/install-mask/install-mask-9999.ebuild
b/app-portage/install-mask/install-mask-9999.ebuild
deleted file mode 100644
index cd4d655ebd3..00000000000
--- a/app-portage/install-mask/install-mask-9999.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1
-
-#if LIVE
-EGIT_REPO_URI="https://bitbucket.org/mgorny/${PN}.git";
-inherit git-r3
-#endif
-
-DESCRIPTION="Handle INSTALL_MASK setting in make.conf"
-HOMEPAGE="https://bitbucket.org/mgorny/install-mask/";
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2";
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
-IUSE=""
-
-RDEPEND="app-portage/flaggie[${PYTHON_USEDEP}]"
-#if LIVE
-
-KEYWORDS=
-SRC_URI=
-#endif
-
-python_install_all() {
- distutils-r1_python_install_all
-
- insinto /usr/share/portage/config/sets
- newins sets.conf ${PN}.conf
-}
diff --git a/app-portage/install-mask/metadata.xml
b/app-portage/install-mask/metadata.xml
deleted file mode 100644
index 34455911e2d..00000000000
--- a/app-portage/install-mask/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
- <maintainer type="person">
- <email>mgo...@gentoo.org</email>
- <name>Michał Górny</name>
- </maintainer>
- <upstream>
- <maintainer status="active">
- <email>mgo...@gentoo.org</email>
- <name>Michał Górny</name>
- </maintainer>
- <bugs-to>https://bitbucket.org/mgorny/install-mask/issues/</bugs-to>
- <remote-id type="bitbucket">mgorny/install-mask</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/profiles/package.mask b/profiles/package.mask
index e3cc64eb647..6e591c91ae6 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -447,12 +447,6 @@ media-gfx/exiftags
app-admin/certmgr
app-admin/ksonnet
-# Michał Górny <mgo...@gentoo.org> (2019-11-03)
-# Discontinued upstream. Relies on app-portage/flaggie make.conf
-# editing support that was fragile and therefore was removed.
-# Removal in 30 days. Bug #699244.
-app-portage/install-mask
-
# Alfredo Tupone <tup...@gentoo.org> (2019-11-03)
# The binary for gps are included in dev-ada/gnat-suite-bin
# Removal in 30 days.
