From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D80BD13835A for ; Thu, 11 Feb 2021 07:23:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E946FE0CA2; Thu, 11 Feb 2021 07:23:50 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D4E9EE0CA2 for ; Thu, 11 Feb 2021 07:23:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A5B35340F94 for ; Thu, 11 Feb 2021 07:23:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B8D454BE for ; Thu, 11 Feb 2021 07:23:47 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1613028221.233fc6351d0432ada5df2f6e52ad85725a9b7a8d.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-apps/radicale/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-apps/radicale/radicale-2.1.12-r3.ebuild www-apps/radicale/radicale-2.1.12.ebuild X-VCS-Directories: www-apps/radicale/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 233fc6351d0432ada5df2f6e52ad85725a9b7a8d X-VCS-Branch: master Date: Thu, 11 Feb 2021 07:23:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c48a9444-c9a7-4482-8806-26f3b965be26 X-Archives-Hash: e5870780c36436f4a26ee850ab8e6e06 commit: 233fc6351d0432ada5df2f6e52ad85725a9b7a8d Author: Joonas Niilola gentoo org> AuthorDate: Thu Feb 11 07:22:00 2021 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Thu Feb 11 07:23:41 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=233fc635 www-apps/radicale: ebuild enchancements - add DISTUTILS_USE_SETUPTOOLS, - drop the revision bump, - remove bunch of unused code, - sort the RDEPEND list. Signed-off-by: Joonas Niilola gentoo.org> ...ale-2.1.12-r3.ebuild => radicale-2.1.12.ebuild} | 32 ++-------------------- 1 file changed, 3 insertions(+), 29 deletions(-) diff --git a/www-apps/radicale/radicale-2.1.12-r3.ebuild b/www-apps/radicale/radicale-2.1.12.ebuild similarity index 58% rename from www-apps/radicale/radicale-2.1.12-r3.ebuild rename to www-apps/radicale/radicale-2.1.12.ebuild index 85a6b5f135b..aef65e3ee5d 100644 --- a/www-apps/radicale/radicale-2.1.12-r3.ebuild +++ b/www-apps/radicale/radicale-2.1.12.ebuild @@ -3,6 +3,7 @@ EAPI="7" +DISTUTILS_USE_SETUPTOOLS=rdepend PYTHON_COMPAT=( python3_{7,8} ) inherit distutils-r1 eutils systemd @@ -22,42 +23,15 @@ IUSE="+bcrypt" RDEPEND=" acct-user/radicale acct-group/radicale - sys-apps/util-linux >=dev-python/vobject-0.9.6[${PYTHON_USEDEP}] >=dev-python/python-dateutil-2.7.3[${PYTHON_USEDEP}] + sys-apps/util-linux bcrypt? ( dev-python/passlib[bcrypt,${PYTHON_USEDEP}] )" -S=${WORKDIR}/${MY_P} +S="${WORKDIR}/${MY_P}" RDIR=/var/lib/${PN} -#pkg_pretend() { -# if [[ -f ${RDIR}/.props && ${MERGE_TYPE} != buildonly ]]; then -# eerror "It looks like you have a version 1 database in ${RDIR}." -# eerror "You must convert this database to version 2 format before upgrading." -# eerror "You may want to back up the old database before migrating." -# eerror -# eerror "If you have kept the Gentoo-default database configuration, this will work:" -# eerror "1. Stop any running instance of Radicale." -# eerror "2. Run \`radicale --export-storage ~/radicale-exported\`." -# eerror "3. Run \`chown -R radicale: ~/radicale-exported\`" -# eerror "4. Run \`mv \"${RDIR}\" \"${RDIR}.old\"\`." -# eerror "5. Install Radicale version 2." -# eerror "6. Run \`mv ~/radicale-exported \"${RDIR}/collections\"\`." -# eerror -# eerror "For more details, or if you are have a more complex configuration," -# eerror "please see the migration guide: https://radicale.org/1to2/" -# eerror "If you do a custom migration, please ensure the database is cleaned out of" -# eerror "${RDIR}, including the hidden .props file." -# die -# fi -#} - -#pkg_setup() { -# enewgroup ${PN} -# enewuser ${PN} -1 -1 ${RDIR} ${PN} -#} - python_install_all() { rm README* || die