gentoo resync : 15.01.2020

4 files changed, 2 insertions, 91 deletions

diff --git a/www-apps/piwigo/Manifest b/www-apps/piwigo/Manifest
index c146768deffa..2725f7144e6b 100644
--- a/www-apps/piwigo/Manifest
+++ b/www-apps/piwigo/Manifest
@@ -1,7 +1,3 @@
-DIST piwigo-2.10.0.zip 17155586 BLAKE2B 55610ff7714ccb50c15460edae37f0720bd7217a2e6034e844e978002ac0f1a90e1893bed0bf1132ee742ad68f810aac99345d9134787ef0ab9a6cdbc9591327 SHA512 665bdd45b5bd178fcc7c2133e9d1e3e81746eb3f877d0ef1253a74b3ec219ceda8fa4b4ec1d9d82302564170023f503b62f1c288f6c1226a4a32ca2e733cc9fa
 DIST piwigo-2.10.1.zip 17155920 BLAKE2B 2f25d6c4488d9208bd37ad98b2ddfa302d23600442165d5513c8b21c72d017c17ef1c10357009110ba79259ee5a4f0a9495a423235c98cd8d5003ba83bd9b980 SHA512 9ca1119db13f312d16a7a3f04564562b26abd45b6ee731cd2280192fff14384add077a3a14a139f7b5301008c6c702a302de76a3a23873b835ec8417127aa77f
-DIST piwigo-2.9.5.zip 7870527 BLAKE2B 6a61f97125d3594d1672d3e9dec29716dff62417c07f0803c576c2cd9636273425342791e97abd7abc8f50dac56ebc4b7843435d75cbb3fd8c29e9723f9a32c7 SHA512 d211a86b40f3a20f406a4bbce87c094bc155b664fe7fb5ec5ab4de6e0bb0228c0c0aa30a04437469ea2360bc72b9e76b265b2811d77aad857fd85eeccb4d30c2
-EBUILD piwigo-2.10.0.ebuild 1121 BLAKE2B 1f64b9af80585ae554f6298d155f68c52c9892d251ad2fd8d8353ab1f7bfba3c953e4743d40a1ae5e7f47379c7097c1afa09f556b8e69d4385fc41206c64a1e6 SHA512 55a8f58f161d29f2c53e520147f13dd6d3b25e4f0dbafc42c8e6f3c57a8498ff6084e59bdb3594fd282e6d1567f3375fee3ad90cd2384707a29990904b75df08
-EBUILD piwigo-2.10.1.ebuild 1121 BLAKE2B 1f64b9af80585ae554f6298d155f68c52c9892d251ad2fd8d8353ab1f7bfba3c953e4743d40a1ae5e7f47379c7097c1afa09f556b8e69d4385fc41206c64a1e6 SHA512 55a8f58f161d29f2c53e520147f13dd6d3b25e4f0dbafc42c8e6f3c57a8498ff6084e59bdb3594fd282e6d1567f3375fee3ad90cd2384707a29990904b75df08
-EBUILD piwigo-2.9.5.ebuild 1121 BLAKE2B 1f64b9af80585ae554f6298d155f68c52c9892d251ad2fd8d8353ab1f7bfba3c953e4743d40a1ae5e7f47379c7097c1afa09f556b8e69d4385fc41206c64a1e6 SHA512 55a8f58f161d29f2c53e520147f13dd6d3b25e4f0dbafc42c8e6f3c57a8498ff6084e59bdb3594fd282e6d1567f3375fee3ad90cd2384707a29990904b75df08
+EBUILD piwigo-2.10.1.ebuild 1146 BLAKE2B 286eeac654aa9a145153de1a4f53a9c6fbcb4cffcb7b3f089be7e66745ebb4600e30446ff33d1d64b427c142a43b4de7f4249ee87e4952775a4d8814d8b408b0 SHA512 437b6be210cbe39616136a9439e75a912e4a04ab11ec0e754549668143062bc6e97ede7bf92a901ffe838c2703684c23a6a47500e3d542d59bb8653dff4a03b7
 MISC metadata.xml 1022 BLAKE2B 88bca793744995b53bf2c0a5061d47798d4f2b42a8025f7bc2f1cf7dc11234d5a8c5df9ed08b9d63b99465e06015bd5dcefaa87d1daf39f8b795ab89e264a563 SHA512 8d011157201c6e25b0252239cf6bc87f596a414a37fbf990c44dfc419b5bb28b4796b4a0c9e00d78154bdbb5dd7e6f0e99b99df56fa4736a7cc55a6ccecdbf09
diff --git a/www-apps/piwigo/piwigo-2.10.0.ebuild b/www-apps/piwigo/piwigo-2.10.0.ebuild
deleted file mode 100644
index 56866abb3045..000000000000
--- a/www-apps/piwigo/piwigo-2.10.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit webapp
-
-DESCRIPTION="a photo gallery software for the web"
-HOMEPAGE="http://piwigo.org/"
-SRC_URI="http://piwigo.org/download/dlcounter.php?code=${PV} -> ${P}.zip"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="+exif +gd imagemagick"
-
-DEPEND=""
-RDEPEND="
-	imagemagick? ( virtual/imagemagick-tools )
-	dev-lang/php[ctype,exif?,gd?,filter,iconv,json,mysqli]
-	>=virtual/mysql-5.0
-	virtual/httpd-php"
-
-REQUIRED_USE="|| ( gd imagemagick )"
-
-S=${WORKDIR}/${PN}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	# Local configuration, and parts that can be updated
-	webapp_serverowned "${MY_HTDOCSDIR}"/_data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/galleries
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/language
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/local
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/plugins
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/template-extension
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/themes
-	webapp_serverowned "${MY_HTDOCSDIR}"/upload
-
-	webapp_src_install
-}
diff --git a/www-apps/piwigo/piwigo-2.10.1.ebuild b/www-apps/piwigo/piwigo-2.10.1.ebuild
index 56866abb3045..208eb4ede249 100644
--- a/www-apps/piwigo/piwigo-2.10.1.ebuild
+++ b/www-apps/piwigo/piwigo-2.10.1.ebuild
@@ -18,6 +18,7 @@ RDEPEND="
 	dev-lang/php[ctype,exif?,gd?,filter,iconv,json,mysqli]
 	>=virtual/mysql-5.0
 	virtual/httpd-php"
+BDEPEND="app-arch/unzip"
 
 REQUIRED_USE="|| ( gd imagemagick )"
 
diff --git a/www-apps/piwigo/piwigo-2.9.5.ebuild b/www-apps/piwigo/piwigo-2.9.5.ebuild
deleted file mode 100644
index 56866abb3045..000000000000
--- a/www-apps/piwigo/piwigo-2.9.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit webapp
-
-DESCRIPTION="a photo gallery software for the web"
-HOMEPAGE="http://piwigo.org/"
-SRC_URI="http://piwigo.org/download/dlcounter.php?code=${PV} -> ${P}.zip"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="+exif +gd imagemagick"
-
-DEPEND=""
-RDEPEND="
-	imagemagick? ( virtual/imagemagick-tools )
-	dev-lang/php[ctype,exif?,gd?,filter,iconv,json,mysqli]
-	>=virtual/mysql-5.0
-	virtual/httpd-php"
-
-REQUIRED_USE="|| ( gd imagemagick )"
-
-S=${WORKDIR}/${PN}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	# Local configuration, and parts that can be updated
-	webapp_serverowned "${MY_HTDOCSDIR}"/_data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/galleries
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/language
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/local
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/plugins
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/template-extension
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/themes
-	webapp_serverowned "${MY_HTDOCSDIR}"/upload
-
-	webapp_src_install
-}