[gentoo-commits] repo/gentoo:master commit in: www-apps/curator/

[gentoo-commits] repo/gentoo:master commit in: www-apps/curator/

[Pacho Ramos]

commit:     338c1b6def1096b9aa15ebbaad22418b98b3af7b
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat May 28 09:29:57 2016 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat May 28 09:31:40 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=338c1b6d

www-apps/curator: Cleanup due to #148577

Package-Manager: portage-2.3.0_rc1

 www-apps/curator/metadata.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/www-apps/curator/metadata.xml b/www-apps/curator/metadata.xml
index a68bb3e..3adf7af 100644
--- a/www-apps/curator/metadata.xml
+++ b/www-apps/curator/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>fauli@gentoo.org</email>
-    <name>Christian Faulhammer</name>
-  </maintainer>
 <maintainer type="project">
     <email>web-apps@gentoo.org</email>
     <name>Gentoo Webapps</name>

[gentoo-commits] repo/gentoo:master commit in: www-apps/curator/

[David Seifert]

commit:     f2d2db4f95553d458d208d1667d563ec8c106ba6
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 11 19:21:55 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Feb 11 19:46:10 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2d2db4f

www-apps/curator: Depend on virtual/imagemagick-tools

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3907

 .../{curator-3.0_p20110120.ebuild => curator-3.0_p20110120-r1.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www-apps/curator/curator-3.0_p20110120.ebuild b/www-apps/curator/curator-3.0_p20110120-r1.ebuild
similarity index 83%
rename from www-apps/curator/curator-3.0_p20110120.ebuild
rename to www-apps/curator/curator-3.0_p20110120-r1.ebuild
index daf35b6494..2b19f82a3b 100644
--- a/www-apps/curator/curator-3.0_p20110120.ebuild
+++ b/www-apps/curator/curator-3.0_p20110120-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -20,7 +20,7 @@ IUSE=""
 DEPEND=""
 RDEPEND="${DEPEND}
 	dev-python/pillow
-	|| ( >=media-gfx/imagemagick-5.4.9 media-gfx/graphicsmagick[imagemagick] )"
+	virtual/imagemagick-tools"
 
 S="${WORKDIR}/curator-3.0_pf078f1686a78"
 

[gentoo-commits] repo/gentoo:master commit in: www-apps/curator/

[Michał Górny]

commit:     d9ef359535c0d376019e3b94e59160ee53d9edf9
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 19 23:10:51 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Feb 19 23:20:41 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9ef3595

www-apps/curator: python-single-r1, EAPI=6

 ...20-r1.ebuild => curator-3.0_p20110120-r2.ebuild} | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/www-apps/curator/curator-3.0_p20110120-r1.ebuild b/www-apps/curator/curator-3.0_p20110120-r2.ebuild
similarity index 67%
rename from www-apps/curator/curator-3.0_p20110120-r1.ebuild
rename to www-apps/curator/curator-3.0_p20110120-r2.ebuild
index 2b19f82a3b..b3282ab4f0 100644
--- a/www-apps/curator/curator-3.0_p20110120-r1.ebuild
+++ b/www-apps/curator/curator-3.0_p20110120-r2.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=4
+EAPI=6
 
-PYTHON_DEPEND="2"
+PYTHON_COMPAT=( python2_7 )
 
-inherit python
+inherit python-single-r1
 
 DESCRIPTION="Gallery generator"
 HOMEPAGE="http://furius.ca/curator/"
@@ -19,21 +19,20 @@ IUSE=""
 
 DEPEND=""
 RDEPEND="${DEPEND}
-	dev-python/pillow
+	${PYTHON_DEPS}
+	dev-python/pillow[${PYTHON_USEDEP}]
 	virtual/imagemagick-tools"
 
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
 S="${WORKDIR}/curator-3.0_pf078f1686a78"
 
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
 src_compile() {
-	:
+	python_fix_shebang hs/curator-hs
 }
 
 src_install() {
 	dobin hs/curator-hs
-	insinto /usr/share/curator/hs
-	doins -r hs/*
+	insinto /usr/share/curator
+	doins -r hs
 }

[gentoo-commits] repo/gentoo:master commit in: www-apps/curator/

[Michał Górny]

commit:     900b3aabdfd8813555a1d99ec0ce7f189779a80b
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  7 20:24:37 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Feb  9 16:37:10 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=900b3aab

www-apps/curator: Switch to PYTHON_MULTI_USEDEP API

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 ...ator-3.0_p20110120-r2.ebuild => curator-3.0_p20110120-r3.ebuild} | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/www-apps/curator/curator-3.0_p20110120-r2.ebuild b/www-apps/curator/curator-3.0_p20110120-r3.ebuild
similarity index 84%
rename from www-apps/curator/curator-3.0_p20110120-r2.ebuild
rename to www-apps/curator/curator-3.0_p20110120-r3.ebuild
index 965e48375b6..31738bc61f4 100644
--- a/www-apps/curator/curator-3.0_p20110120-r2.ebuild
+++ b/www-apps/curator/curator-3.0_p20110120-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,9 @@ IUSE=""
 DEPEND=""
 RDEPEND="${DEPEND}
 	${PYTHON_DEPS}
-	dev-python/pillow[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+	')
 	virtual/imagemagick-tools"
 
 REQUIRED_USE=${PYTHON_REQUIRED_USE}