From 488a2d98adde81ee0595d6bbef33af03edf2c175 Mon Sep 17 00:00:00 2001 From: Mikle Kolyada Date: Fri, 27 Mar 2020 10:48:00 +0300 Subject: [PATCH] sys-apps/entropy: remove last-rited pkg Closes: https://bugs.gentoo.org/709466 Signed-off-by: Mikle Kolyada --- app-admin/equo/Manifest | 1 - app-admin/equo/equo-302-r1.ebuild | 41 ------- app-admin/equo/metadata.xml | 8 -- app-admin/matter/Manifest | 1 - app-admin/matter/matter-302-r1.ebuild | 36 ------ app-admin/matter/metadata.xml | 11 -- profiles/package.mask | 9 -- sys-apps/entropy-server/Manifest | 1 - .../entropy-server-302-r1.ebuild | 35 ------ sys-apps/entropy-server/metadata.xml | 11 -- sys-apps/entropy/Manifest | 1 - sys-apps/entropy/entropy-302-r2.ebuild | 113 ------------------ sys-apps/entropy/metadata.xml | 8 -- 13 files changed, 276 deletions(-) delete mode 100644 app-admin/equo/Manifest delete mode 100644 app-admin/equo/equo-302-r1.ebuild delete mode 100644 app-admin/equo/metadata.xml delete mode 100644 app-admin/matter/Manifest delete mode 100644 app-admin/matter/matter-302-r1.ebuild delete mode 100644 app-admin/matter/metadata.xml delete mode 100644 sys-apps/entropy-server/Manifest delete mode 100644 sys-apps/entropy-server/entropy-server-302-r1.ebuild delete mode 100644 sys-apps/entropy-server/metadata.xml delete mode 100644 sys-apps/entropy/Manifest delete mode 100644 sys-apps/entropy/entropy-302-r2.ebuild delete mode 100644 sys-apps/entropy/metadata.xml diff --git a/app-admin/equo/Manifest b/app-admin/equo/Manifest deleted file mode 100644 index 83425c6b1a26..000000000000 --- a/app-admin/equo/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST entropy-302.tar.bz2 1701434 BLAKE2B 6e95c000921ddcbf2dd360b841245b9d1ea3e0b14aa5c3d9c532cfb0c56ab9746549d39ec5f27a22d3fed3e1e1fa809fc8e443c212403c4c22fe87af8a4b5955 SHA512 9c3e577b9d3d94ec8491fc10012aec1347bfe440c8bdc473df73e424ae4e3eb89bf96e31c444e8d6ff7574848a6ac44f5ed114bc90d2e6b03e4a00f9873c027e diff --git a/app-admin/equo/equo-302-r1.ebuild b/app-admin/equo/equo-302-r1.ebuild deleted file mode 100644 index e962a0d782f6..000000000000 --- a/app-admin/equo/equo-302-r1.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -inherit eutils python-single-r1 bash-completion-r1 - -DESCRIPTION="Entropy Package Manager text-based client" -HOMEPAGE="http://www.sabayon.org" -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="" -SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2" - -S="${WORKDIR}/entropy-${PV}" - -COMMON_DEPEND="${PYTHON_DEPS} - ~sys-apps/entropy-${PV}[${PYTHON_SINGLE_USEDEP}]" -DEPEND="${COMMON_DEPEND} - app-text/asciidoc" -RDEPEND="${COMMON_DEPEND} - sys-apps/file[python]" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -src_compile() { - cd "${S}"/client || die - emake -} - -src_install() { - cd "${S}"/client || die - emake DESTDIR="${D}" LIBDIR="usr/lib" install - newbashcomp "${S}/misc/equo-completion.bash" equo - - python_optimize "${D}/usr/lib/entropy/client" -} diff --git a/app-admin/equo/metadata.xml b/app-admin/equo/metadata.xml deleted file mode 100644 index d396d1b7e5a1..000000000000 --- a/app-admin/equo/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - mudler@gentoo.org - Ettore Di Giacinto - - diff --git a/app-admin/matter/Manifest b/app-admin/matter/Manifest deleted file mode 100644 index 83425c6b1a26..000000000000 --- a/app-admin/matter/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST entropy-302.tar.bz2 1701434 BLAKE2B 6e95c000921ddcbf2dd360b841245b9d1ea3e0b14aa5c3d9c532cfb0c56ab9746549d39ec5f27a22d3fed3e1e1fa809fc8e443c212403c4c22fe87af8a4b5955 SHA512 9c3e577b9d3d94ec8491fc10012aec1347bfe440c8bdc473df73e424ae4e3eb89bf96e31c444e8d6ff7574848a6ac44f5ed114bc90d2e6b03e4a00f9873c027e diff --git a/app-admin/matter/matter-302-r1.ebuild b/app-admin/matter/matter-302-r1.ebuild deleted file mode 100644 index 9505601252b6..000000000000 --- a/app-admin/matter/matter-302-r1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -inherit eutils python-single-r1 bash-completion-r1 - -DESCRIPTION="Automated Packages Builder for Portage and Entropy" -HOMEPAGE="http://www.sabayon.org" -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="+entropy" -SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2" - -S="${WORKDIR}/entropy-${PV}/${PN}" - -DEPEND="" -RDEPEND="entropy? ( ~sys-apps/entropy-${PV}[${PYTHON_SINGLE_USEDEP}] ) - sys-apps/file[python] - ${PYTHON_DEPS}" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -src_install() { - emake DESTDIR="${D}" install - emake DESTDIR="${D}" base-install - if use entropy; then - emake DESTDIR="${D}" entropysrv-install - fi - - python_optimize "${D}/usr/lib/matter" -} diff --git a/app-admin/matter/metadata.xml b/app-admin/matter/metadata.xml deleted file mode 100644 index 975adc49c8bd..000000000000 --- a/app-admin/matter/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - mudler@gentoo.org - Ettore Di Giacinto - - - Add Entropy support - - diff --git a/profiles/package.mask b/profiles/package.mask index 40713b2d59b8..77f4423b662f 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -461,15 +461,6 @@ app-admin/packagekit-qt app-backup/deja-dup gnome-extra/gnome-packagekit -# Michał Górny (2020-02-24) -# Effectively unmaintained in Gentoo. Multiple versions behind -# upstream. Python 2 only. -# Removal in 30 days. Bug #709466. -app-admin/equo -app-admin/matter -sys-apps/entropy -sys-apps/entropy-server - # David Seifert (2020-02-23) # Last release in 2013, the scons SConstruct script uses variables # that have been removed from Scons years ago and also uses a ton of diff --git a/sys-apps/entropy-server/Manifest b/sys-apps/entropy-server/Manifest deleted file mode 100644 index 83425c6b1a26..000000000000 --- a/sys-apps/entropy-server/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST entropy-302.tar.bz2 1701434 BLAKE2B 6e95c000921ddcbf2dd360b841245b9d1ea3e0b14aa5c3d9c532cfb0c56ab9746549d39ec5f27a22d3fed3e1e1fa809fc8e443c212403c4c22fe87af8a4b5955 SHA512 9c3e577b9d3d94ec8491fc10012aec1347bfe440c8bdc473df73e424ae4e3eb89bf96e31c444e8d6ff7574848a6ac44f5ed114bc90d2e6b03e4a00f9873c027e diff --git a/sys-apps/entropy-server/entropy-server-302-r1.ebuild b/sys-apps/entropy-server/entropy-server-302-r1.ebuild deleted file mode 100644 index a3fb4d6d958a..000000000000 --- a/sys-apps/entropy-server/entropy-server-302-r1.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -inherit eutils python-single-r1 bash-completion-r1 - -DESCRIPTION="Entropy Package Manager server-side tools" -HOMEPAGE="http://www.sabayon.org" -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="+matter" - -SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2" - -S="${WORKDIR}/entropy-${PV}/server" - -RDEPEND="~sys-apps/entropy-${PV}[${PYTHON_SINGLE_USEDEP}] - matter? ( ~app-admin/matter-${PV}[entropy] ) - ${PYTHON_DEPS} - " -DEPEND="app-text/asciidoc" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -src_install() { - emake DESTDIR="${D}" install - newbashcomp "${S}/eit-completion.bash" eit - - python_optimize "${D}/usr/lib/entropy/server" -} diff --git a/sys-apps/entropy-server/metadata.xml b/sys-apps/entropy-server/metadata.xml deleted file mode 100644 index 96469c72571a..000000000000 --- a/sys-apps/entropy-server/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - mudler@gentoo.org - Ettore Di Giacinto - - - Pull in app-admin/matter - - diff --git a/sys-apps/entropy/Manifest b/sys-apps/entropy/Manifest deleted file mode 100644 index 83425c6b1a26..000000000000 --- a/sys-apps/entropy/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST entropy-302.tar.bz2 1701434 BLAKE2B 6e95c000921ddcbf2dd360b841245b9d1ea3e0b14aa5c3d9c532cfb0c56ab9746549d39ec5f27a22d3fed3e1e1fa809fc8e443c212403c4c22fe87af8a4b5955 SHA512 9c3e577b9d3d94ec8491fc10012aec1347bfe440c8bdc473df73e424ae4e3eb89bf96e31c444e8d6ff7574848a6ac44f5ed114bc90d2e6b03e4a00f9873c027e diff --git a/sys-apps/entropy/entropy-302-r2.ebuild b/sys-apps/entropy/entropy-302-r2.ebuild deleted file mode 100644 index 60d514f0e66c..000000000000 --- a/sys-apps/entropy/entropy-302-r2.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="sqlite" - -inherit eutils python-single-r1 user - -DESCRIPTION="Entropy Package Manager foundation library" -HOMEPAGE="http://www.sabayon.org" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86" - -IUSE="" -SRC_URI="mirror://sabayon/${CATEGORY}/${P}.tar.bz2" - -RDEPEND=">=app-misc/pax-utils-0.7 - dev-db/sqlite:3[soundex(+)] - net-misc/rsync - sys-apps/diffutils - sys-apps/sandbox - $(python_gen_cond_dep ' - >=sys-apps/portage-2.1.9[${PYTHON_MULTI_USEDEP}] - ') - sys-devel/gettext - ${PYTHON_DEPS}" -DEPEND="${RDEPEND} - dev-util/intltool" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -S="${S}/lib" - -REPO_CONFPATH="${ROOT}/etc/entropy/repositories.conf" -REPO_D_CONFPATH="${ROOT}/etc/entropy/repositories.conf.d" -ENTROPY_CACHEDIR="${ROOT}/var/lib/entropy/caches" - -pkg_setup() { - python-single-r1_pkg_setup - # Can: - # - update repos - # - update security advisories - # - handle on-disk cache (atm) - enewgroup entropy || die "failed to create entropy group" - # Create unprivileged entropy user - enewgroup entropy-nopriv || die "failed to create entropy-nopriv group" - enewuser entropy-nopriv -1 -1 -1 entropy-nopriv || die "failed to create entropy-nopriv user" -} - -src_install() { - emake DESTDIR="${D}" LIBDIR="usr/lib" install - - python_optimize "${D}/usr/lib/entropy/lib/entropy" -} - -pkg_postinst() { - for ex_conf in "${REPO_D_CONFPATH}"/_entropy_sabayon-limbo.example; do - real_conf="${ex_conf%.example}" - if [ -f "${real_conf}" ] || [ -f "${real_conf/_}" ]; then - # skip installation then - continue - fi - elog "Installing: ${real_conf}" - cp "${ex_conf}" "${real_conf}" -p - done - - # Copy config file over - if [ -f "${REPO_CONFPATH}.example" ] && [ ! -f "${REPO_CONFPATH}" ]; then - elog "Copying ${REPO_CONFPATH}.example over to ${REPO_CONFPATH}" - cp "${REPO_CONFPATH}.example" "${REPO_CONFPATH}" -p - fi - - if [ -d "${ENTROPY_CACHEDIR}" ]; then - einfo "Purging current Entropy cache" - rm -rf "${ENTROPY_CACHEDIR}"/* - fi - - # Fixup Entropy Resources Lock, and /etc/entropy/packages - # files permissions. This fixes unprivileged Entropy Library usage - local res_file="${ROOT}"/var/lib/entropy/client/database/*/.using_resources - if [ -f "${res_file}" ]; then - chown root:entropy "${res_file}" - chmod g+rw "${res_file}" - chmod o+r "${res_file}" - fi - local pkg_files="package.mask package.unmask package.mask.d package.unmask.d" - local pkg_file - for pkg_file in ${pkg_files}; do - pkg_file="${ROOT}/etc/entropy/packages/${pkg_file}" - recursive="" - if [ -d "${pkg_file}" ]; then - recursive="-R" - fi - if [ -e "${pkg_file}" ]; then - chown ${recursive} root:entropy "${pkg_file}" - chmod ${recursive} go+r "${pkg_file}" - fi - done - - # Setup Entropy Library directories ownership - chown root:entropy "${ROOT}/var/lib/entropy" # no recursion - chown root:entropy "${ROOT}/var/lib/entropy/client/packages" # no recursion - chown root:entropy "${ROOT}/var/log/entropy" # no recursion - - echo - elog "If you want to enable Entropy packages delta download support, please" - elog "install dev-util/bsdiff." - echo -} diff --git a/sys-apps/entropy/metadata.xml b/sys-apps/entropy/metadata.xml deleted file mode 100644 index d396d1b7e5a1..000000000000 --- a/sys-apps/entropy/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - mudler@gentoo.org - Ettore Di Giacinto - - -- 2.26.2