From 946c17032a6863fcdf0c2de9d76d04cc14e33b22 Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Fri, 7 Feb 2020 21:17:49 +0100 Subject: sys-apps/entropy: Switch to PYTHON_MULTI_USEDEP API MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- sys-apps/entropy/entropy-302-r1.ebuild | 111 -------------------------------- sys-apps/entropy/entropy-302-r2.ebuild | 113 +++++++++++++++++++++++++++++++++ 2 files changed, 113 insertions(+), 111 deletions(-) delete mode 100644 sys-apps/entropy/entropy-302-r1.ebuild create mode 100644 sys-apps/entropy/entropy-302-r2.ebuild (limited to 'sys-apps/entropy') diff --git a/sys-apps/entropy/entropy-302-r1.ebuild b/sys-apps/entropy/entropy-302-r1.ebuild deleted file mode 100644 index a617ded3def4..000000000000 --- a/sys-apps/entropy/entropy-302-r1.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# 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 - >=sys-apps/portage-2.1.9[${PYTHON_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/entropy-302-r2.ebuild b/sys-apps/entropy/entropy-302-r2.ebuild new file mode 100644 index 000000000000..60d514f0e66c --- /dev/null +++ b/sys-apps/entropy/entropy-302-r2.ebuild @@ -0,0 +1,113 @@ +# 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 +} -- cgit v1.2.3-65-gdbad