commit:     11bd1f0be672cf76b1eff9b7af84398556a399f0
Author:     Randall T. Vasquez <ran.dall <AT> icloud <DOT> com>
AuthorDate: Sat Nov 26 20:32:15 2022 +0000
Commit:     Randall Vasquez <ran.dall <AT> icloud <DOT> com>
CommitDate: Sat Nov 26 20:32:15 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=11bd1f0b

dev-python/material-color-utilities: fix and refactor ebuilds

Signed-off-by: Randall T. Vasquez <ran.dall <AT> icloud.com>

 dev-python/material-color-utilities/Manifest       |  2 +-
 .../material-color-utilities-0.1.5.ebuild          | 32 +++++++++++++++-------
 .../material-color-utilities-9999.ebuild           | 32 ++++++++++++++++------
 dev-python/material-color-utilities/metadata.xml   | 11 +++++++-
 4 files changed, 56 insertions(+), 21 deletions(-)

diff --git a/dev-python/material-color-utilities/Manifest 
b/dev-python/material-color-utilities/Manifest
index 5a202bca6..81cf2c70b 100644
--- a/dev-python/material-color-utilities/Manifest
+++ b/dev-python/material-color-utilities/Manifest
@@ -1 +1 @@
-DIST material-color-utilities-python-0.1.5.tar.gz 25702 BLAKE2B 
cf444831fec962caae3a1871b8331dcdd055f186754631185140842e49e1dc5526c5aedc021d28cd5e192e6f593774abce34e4a2853049e9ded2cf3ca9b79e3f
 SHA512 
f3987da2723f9bc0a383d544868bd48b79c815c1ef3b601cf7daf711ae66ba2e20c38d272fff34b8fef724d202cdb71431d885d0fc86cf6b459a8735cd0751a4
+DIST material-color-utilities-0.1.5.tar.gz 25702 BLAKE2B 
cf444831fec962caae3a1871b8331dcdd055f186754631185140842e49e1dc5526c5aedc021d28cd5e192e6f593774abce34e4a2853049e9ded2cf3ca9b79e3f
 SHA512 
f3987da2723f9bc0a383d544868bd48b79c815c1ef3b601cf7daf711ae66ba2e20c38d272fff34b8fef724d202cdb71431d885d0fc86cf6b459a8735cd0751a4

diff --git 
a/dev-python/material-color-utilities/material-color-utilities-0.1.5.ebuild 
b/dev-python/material-color-utilities/material-color-utilities-0.1.5.ebuild
index b29eb06e5..436351638 100644
--- a/dev-python/material-color-utilities/material-color-utilities-0.1.5.ebuild
+++ b/dev-python/material-color-utilities/material-color-utilities-0.1.5.ebuild
@@ -1,23 +1,35 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_COMPAT=(python3_{8..11})
 DISTUTILS_USE_PEP517=poetry
 inherit distutils-r1
 
+MY_PN="${PN}-python"
+MY_P="${MY_PN}-${PV}"
+
 DESCRIPTION="Python port of material-color-utilities used for Material You 
colors"
-HOMEPAGE="https://python-telegram-bot.org 
https://github.com/python-telegram-bot/python-telegram-bot";
-SRC_URI="https://files.pythonhosted.org/packages/source/${PN::1}/${PN}-python/${PN}-python-${PV}.tar.gz";
+HOMEPAGE="
+       https://pypi.org/project/material-color-utilities/
+"
+
+if [[ ${PV} == *9999 ]]; then
+       inherit git-r3
+       
EGIT_REPO_URI="https://github.com/avanishsubbiah/material-color-utilities-python.git";
+else
+       
SRC_URI="https://files.pythonhosted.org/packages/source/m/material-color-utilities-python/material-color-utilities-python-${PV}.tar.gz
 -> ${P}.tar.gz"
+       KEYWORDS="~amd64 ~arm64"
+       S="${WORKDIR}/${MY_P}"
+fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
 
-S=${WORKDIR}/${PN}-python-${PV}
+RDEPEND="
+       dev-python/pillow[${PYTHON_USEDEP}]
+       dev-python/regex[${PYTHON_USEDEP}]"
 BDEPEND="
-       ${PYTHON_DEPS}
-       dev-python/poetry-core
-"
+       dev-python/poetry-core[${PYTHON_USEDEP}]
+       dev-python/build[${PYTHON_USEDEP}]"

diff --git 
a/dev-python/material-color-utilities/material-color-utilities-9999.ebuild 
b/dev-python/material-color-utilities/material-color-utilities-9999.ebuild
index 4ed22ecc3..436351638 100644
--- a/dev-python/material-color-utilities/material-color-utilities-9999.ebuild
+++ b/dev-python/material-color-utilities/material-color-utilities-9999.ebuild
@@ -1,21 +1,35 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_COMPAT=(python3_{8..11})
 DISTUTILS_USE_PEP517=poetry
-inherit distutils-r1 git-r3
+inherit distutils-r1
+
+MY_PN="${PN}-python"
+MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Python port of material-color-utilities used for Material You 
colors"
-HOMEPAGE="https://python-telegram-bot.org 
https://github.com/python-telegram-bot/python-telegram-bot";
-EGIT_REPO_URI="https://github.com/avanishsubbiah/material-color-utilities-python";
+HOMEPAGE="
+       https://pypi.org/project/material-color-utilities/
+"
+
+if [[ ${PV} == *9999 ]]; then
+       inherit git-r3
+       
EGIT_REPO_URI="https://github.com/avanishsubbiah/material-color-utilities-python.git";
+else
+       
SRC_URI="https://files.pythonhosted.org/packages/source/m/material-color-utilities-python/material-color-utilities-python-${PV}.tar.gz
 -> ${P}.tar.gz"
+       KEYWORDS="~amd64 ~arm64"
+       S="${WORKDIR}/${MY_P}"
+fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE=""
 
+RDEPEND="
+       dev-python/pillow[${PYTHON_USEDEP}]
+       dev-python/regex[${PYTHON_USEDEP}]"
 BDEPEND="
-       ${PYTHON_DEPS}
-       dev-python/poetry-core
-"
+       dev-python/poetry-core[${PYTHON_USEDEP}]
+       dev-python/build[${PYTHON_USEDEP}]"

diff --git a/dev-python/material-color-utilities/metadata.xml 
b/dev-python/material-color-utilities/metadata.xml
index 3771874aa..342607f86 100644
--- a/dev-python/material-color-utilities/metadata.xml
+++ b/dev-python/material-color-utilities/metadata.xml
@@ -1,8 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
+    <maintainer type="person">
+        <email>ran.d...@icloud.com</email>
+        <name>Randall T. Vasquez</name>
+    </maintainer>
        <maintainer type="person">
                <email>pascal.jae...@leimstift.de</email>
                <name>Pascal Jaeger</name>
        </maintainer>
+    <upstream>
+        <remote-id 
type="github">avanishsubbiah/material-color-utilities-python"</remote-id>
+        <remote-id type="pypi">material-color-utilities</remote-id>
+        
<bugs-to>https://github.com/avanishsubbiah/material-color-utilities-python/issues";</bugs-to>
+    </upstream>
 </pkgmetadata>

Reply via email to