* [gentoo-commits] repo/gentoo:master commit in: dev-python/kivy-garden/, dev-python/kivy-garden/files/
@ 2017-02-08 5:14 Slawek Lis
0 siblings, 0 replies; 3+ messages in thread
From: Slawek Lis @ 2017-02-08 5:14 UTC (permalink / raw
To: gentoo-commits
commit: 57657abd8917f571a5689ad0482da149f5cdd6a6
Author: Slawomir Lis <slis <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 7 19:55:57 2017 +0000
Commit: Slawek Lis <slis <AT> gentoo <DOT> org>
CommitDate: Wed Feb 8 05:13:21 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57657abd
dev-python/kivy-garden: fixing filename conflict
Reported in #607938. Original "garden" tool is renamed to "kivy-garden".
Corresponding einfo message added.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
dev-python/kivy-garden/files/remove_bat.patch | 2 +-
dev-python/kivy-garden/kivy-garden-0.1.4.ebuild | 11 ++++++++++-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/dev-python/kivy-garden/files/remove_bat.patch b/dev-python/kivy-garden/files/remove_bat.patch
index f178f2b..5c11660 100644
--- a/dev-python/kivy-garden/files/remove_bat.patch
+++ b/dev-python/kivy-garden/files/remove_bat.patch
@@ -5,6 +5,6 @@
license='MIT',
packages=['garden'],
- scripts=['bin/garden', 'bin/garden.bat'],
-+ scripts=['bin/garden'],
++ scripts=['bin/kivy-garden'],
install_requires=['requests'],
)
diff --git a/dev-python/kivy-garden/kivy-garden-0.1.4.ebuild b/dev-python/kivy-garden/kivy-garden-0.1.4.ebuild
index e05a0ea..8388475 100644
--- a/dev-python/kivy-garden/kivy-garden-0.1.4.ebuild
+++ b/dev-python/kivy-garden/kivy-garden-0.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -26,3 +26,12 @@ RDEPEND="${DEPEND}"
S="${WORKDIR}/garden-${PV}"
PATCHES=( "${FILESDIR}/remove_bat.patch" )
+
+src_prepare() {
+ distutils-r1_src_prepare
+ mv "${S}/bin/garden" "${S}/bin/kivy-garden"
+}
+
+pkg_postinst() {
+ einfo "Kivy's garden tool is installed as kivy-garden"
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-python/kivy-garden/, dev-python/kivy-garden/files/
@ 2020-02-05 15:48 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2020-02-05 15:48 UTC (permalink / raw
To: gentoo-commits
commit: 22bca4e6dc2d9ecb7031ab4bf75d3ef6d2b76b20
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 5 15:43:51 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Feb 5 15:47:58 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22bca4e6
dev-python/kivy-garden: Remove old (py2)
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/kivy-garden/Manifest | 1 -
dev-python/kivy-garden/files/remove_bat.patch | 10 ---------
dev-python/kivy-garden/kivy-garden-0.1.1.ebuild | 27 -------------------------
3 files changed, 38 deletions(-)
diff --git a/dev-python/kivy-garden/Manifest b/dev-python/kivy-garden/Manifest
index 4e6023681c3..6311028f288 100644
--- a/dev-python/kivy-garden/Manifest
+++ b/dev-python/kivy-garden/Manifest
@@ -1,2 +1 @@
-DIST kivy-garden-0.1.1.tar.gz 5789 BLAKE2B 559f9cc2e58a39881bb08729913a154cdccfdddc9f0b0f6b5f594d2688b37b8ceee463b12998832228b1a925c441aa31192064c2f9974c6a5db8e4242db082e2 SHA512 d551e8fdb08c7c1810972df04b024fb59554a94b9d6dc98a1438620541c13152e8c7de4cc603efed4df00e3d681d8545939ab417266459e26e116ff6660d8013
DIST kivy-garden-0.1.4.tar.gz 6849 BLAKE2B 944d84ce9057db64c1435d9e4f5e4b8d7e812cac39a7ef536974f5b4a4e525d2ed7dc8c214db75d20cf87bdd1effa9e1312d979e264bb93a5edaf4cf43c7441d SHA512 69b8fa2e2e80cc215eaad0eca78e1e207726ef2f611ba328863191580c19e77de970347b206c82927d92fbc821811956f8c45ac3613dafb2db706a491c50585f
diff --git a/dev-python/kivy-garden/files/remove_bat.patch b/dev-python/kivy-garden/files/remove_bat.patch
deleted file mode 100644
index f178f2b1314..00000000000
--- a/dev-python/kivy-garden/files/remove_bat.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/setup.py.orig 2014-04-02 08:48:05.906881843 +0200
-+++ b/setup.py 2014-04-02 08:48:16.650214908 +0200
-@@ -8,6 +8,6 @@
- version='0.1.1',
- license='MIT',
- packages=['garden'],
-- scripts=['bin/garden', 'bin/garden.bat'],
-+ scripts=['bin/garden'],
- install_requires=['requests'],
- )
diff --git a/dev-python/kivy-garden/kivy-garden-0.1.1.ebuild b/dev-python/kivy-garden/kivy-garden-0.1.1.ebuild
deleted file mode 100644
index 19473ac8802..00000000000
--- a/dev-python/kivy-garden/kivy-garden-0.1.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Kivys Garden tool to manage flowers"
-HOMEPAGE="http://kivy-garden.github.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- "
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/garden-${PV}"
-
-PATCHES=( "${FILESDIR}/remove_bat.patch" )
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-python/kivy-garden/, dev-python/kivy-garden/files/
@ 2016-08-08 7:50 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2016-08-08 7:50 UTC (permalink / raw
To: gentoo-commits
commit: 38a3841300f0f1280fdcb2806760f6c996b66e9c
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 7 19:49:27 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Aug 8 07:49:41 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38a38413
dev-python/kivy-garden: Version bump, add py3.5 support
* EAPI=6
Package-Manager: portage-2.3.0
dev-python/kivy-garden/Manifest | 1 +
dev-python/kivy-garden/files/remove_bat.patch | 4 ++--
dev-python/kivy-garden/kivy-garden-0.1.4.ebuild | 28 +++++++++++++++++++++++++
3 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/dev-python/kivy-garden/Manifest b/dev-python/kivy-garden/Manifest
index 939f770..73029d8 100644
--- a/dev-python/kivy-garden/Manifest
+++ b/dev-python/kivy-garden/Manifest
@@ -1 +1,2 @@
DIST kivy-garden-0.1.1.tar.gz 5789 SHA256 bea618e978f962bc0a2bfc3890fafe6c1bc2fa7aaf8a1cd3c8c70a682f33d79f SHA512 d551e8fdb08c7c1810972df04b024fb59554a94b9d6dc98a1438620541c13152e8c7de4cc603efed4df00e3d681d8545939ab417266459e26e116ff6660d8013 WHIRLPOOL 79a5db5b0e854ae2d2cf4bbb2c9d4733bf1a4c772a38e7c4e65cfc050bfb4494712b04095e89e026bd282851f562c4df6f5c1ec25e6a5b5e30f53f5a1c503fcc
+DIST kivy-garden-0.1.4.tar.gz 6849 SHA256 c256f42788421273a08fbb0a228f0fb0e80dd86b629fb8c0920507f645be6c72 SHA512 69b8fa2e2e80cc215eaad0eca78e1e207726ef2f611ba328863191580c19e77de970347b206c82927d92fbc821811956f8c45ac3613dafb2db706a491c50585f WHIRLPOOL eca92d06ac0f482d70f8abe9452e28f1b84648d9911a8241047711cb6389a91da55fc9fda805ebad7318a009bb674106f92097813aae5742617d34ec810bc334
diff --git a/dev-python/kivy-garden/files/remove_bat.patch b/dev-python/kivy-garden/files/remove_bat.patch
index 0d310d4..f178f2b 100644
--- a/dev-python/kivy-garden/files/remove_bat.patch
+++ b/dev-python/kivy-garden/files/remove_bat.patch
@@ -1,5 +1,5 @@
---- setup.py.orig 2014-04-02 08:48:05.906881843 +0200
-+++ setup.py 2014-04-02 08:48:16.650214908 +0200
+--- a/setup.py.orig 2014-04-02 08:48:05.906881843 +0200
++++ b/setup.py 2014-04-02 08:48:16.650214908 +0200
@@ -8,6 +8,6 @@
version='0.1.1',
license='MIT',
diff --git a/dev-python/kivy-garden/kivy-garden-0.1.4.ebuild b/dev-python/kivy-garden/kivy-garden-0.1.4.ebuild
new file mode 100644
index 0000000..e05a0ea
--- /dev/null
+++ b/dev-python/kivy-garden/kivy-garden-0.1.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Kivys Garden tool to manage flowers"
+HOMEPAGE="http://kivy-garden.github.io/"
+SRC_URI="https://pypi.io/packages/source/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ "
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/garden-${PV}"
+
+PATCHES=( "${FILESDIR}/remove_bat.patch" )
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-02-05 15:48 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-02-08 5:14 [gentoo-commits] repo/gentoo:master commit in: dev-python/kivy-garden/, dev-python/kivy-garden/files/ Slawek Lis
-- strict thread matches above, loose matches on Subject: below --
2020-02-05 15:48 Michał Górny
2016-08-08 7:50 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox