summaryrefslogtreecommitdiff
path: root/www-apps
diff options
context:
space:
mode:
Diffstat (limited to 'www-apps')
-rw-r--r--www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3-r2.ebuild (renamed from www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3-r1.ebuild)17
-rw-r--r--www-apps/Apache-Gallery/Manifest2
-rw-r--r--www-apps/Manifest.gzbin12476 -> 12454 bytes
-rw-r--r--www-apps/chromedriver-bin/Manifest4
-rw-r--r--www-apps/chromedriver-bin/chromedriver-bin-103.0.5060.53.ebuild (renamed from www-apps/chromedriver-bin/chromedriver-bin-101.0.4951.41.ebuild)0
-rw-r--r--www-apps/element/Manifest8
-rw-r--r--www-apps/element/element-1.10.14.ebuild (renamed from www-apps/element/element-1.10.10.ebuild)0
-rw-r--r--www-apps/element/element-1.10.15.ebuild (renamed from www-apps/element/element-1.10.11.ebuild)0
-rw-r--r--www-apps/gitea/Manifest11
-rw-r--r--www-apps/gitea/gitea-1.16.5.ebuild107
-rw-r--r--www-apps/gitea/gitea-1.16.6.ebuild107
-rw-r--r--www-apps/gitea/gitea-1.16.7.ebuild2
-rw-r--r--www-apps/gitea/gitea-1.16.8.ebuild (renamed from www-apps/gitea/gitea-1.16.6-r1.ebuild)11
-rw-r--r--www-apps/gitea/metadata.xml21
-rw-r--r--www-apps/grafana-bin/Manifest16
-rw-r--r--www-apps/grafana-bin/grafana-bin-7.5.16.ebuild (renamed from www-apps/grafana-bin/grafana-bin-7.5.15.ebuild)0
-rw-r--r--www-apps/grafana-bin/grafana-bin-8.3.7.ebuild64
-rw-r--r--www-apps/grafana-bin/grafana-bin-8.4.4.ebuild64
-rw-r--r--www-apps/grafana-bin/grafana-bin-8.4.7.ebuild64
-rw-r--r--www-apps/grafana-bin/grafana-bin-8.5.2.ebuild64
-rw-r--r--www-apps/grafana-bin/grafana-bin-8.5.3.ebuild (renamed from www-apps/grafana-bin/grafana-bin-8.3.5.ebuild)0
-rw-r--r--www-apps/hugo/Manifest20
-rw-r--r--www-apps/hugo/files/hugo-0.92.2-link-to-webp-and-sass.patch38
-rw-r--r--www-apps/hugo/files/hugo-0.99.1-fix-testdecodeconfig-basic.patch39
-rw-r--r--www-apps/hugo/files/hugo-0.99.1-test-timeout.patch25
-rw-r--r--www-apps/hugo/hugo-0.101.0.ebuild (renamed from www-apps/hugo/hugo-0.98.0.ebuild)7
-rw-r--r--www-apps/hugo/hugo-0.93.3.ebuild77
-rw-r--r--www-apps/hugo/hugo-0.99.1.ebuild (renamed from www-apps/hugo/hugo-0.96.0.ebuild)10
-rw-r--r--www-apps/hugo/metadata.xml1
-rw-r--r--www-apps/icingaweb2/Manifest4
-rw-r--r--www-apps/icingaweb2/icingaweb2-2.10.2.ebuild (renamed from www-apps/icingaweb2/icingaweb2-2.10.0.ebuild)2
-rw-r--r--www-apps/ikiwiki/Manifest2
-rw-r--r--www-apps/ikiwiki/ikiwiki-3.20200202.3.ebuild112
-rw-r--r--www-apps/jekyll-coffeescript/Manifest2
-rw-r--r--www-apps/jekyll-coffeescript/jekyll-coffeescript-2.0.0.ebuild4
-rw-r--r--www-apps/jekyll-sass-converter/Manifest4
-rw-r--r--www-apps/jekyll-sass-converter/jekyll-sass-converter-2.2.0.ebuild (renamed from www-apps/jekyll-sass-converter/jekyll-sass-converter-2.1.0.ebuild)10
-rw-r--r--www-apps/jekyll-sitemap/Manifest2
-rw-r--r--www-apps/jekyll-sitemap/jekyll-sitemap-1.4.0.ebuild4
-rw-r--r--www-apps/jekyll-watch/Manifest2
-rw-r--r--www-apps/jekyll-watch/jekyll-watch-2.2.1-r1.ebuild4
-rw-r--r--www-apps/jekyll/Manifest7
-rw-r--r--www-apps/jekyll/jekyll-4.1.1.ebuild89
-rw-r--r--www-apps/jekyll/jekyll-4.2.0.ebuild95
-rw-r--r--www-apps/jekyll/jekyll-4.2.2.ebuild (renamed from www-apps/jekyll/jekyll-4.2.0-r1.ebuild)10
-rw-r--r--www-apps/mediawiki/Manifest4
-rw-r--r--www-apps/mediawiki/mediawiki-1.38.1.ebuild (renamed from www-apps/mediawiki/mediawiki-1.36.4.ebuild)4
-rw-r--r--www-apps/miniflux/Manifest3
-rw-r--r--www-apps/miniflux/miniflux-2.0.37.ebuild98
-rw-r--r--www-apps/nanoc-checking/Manifest2
-rw-r--r--www-apps/nanoc-checking/nanoc-checking-1.0.2.ebuild2
-rw-r--r--www-apps/nanoc-cli/Manifest2
-rw-r--r--www-apps/nanoc-cli/nanoc-cli-4.12.6.ebuild70
-rw-r--r--www-apps/nanoc-core/Manifest4
-rw-r--r--www-apps/nanoc-core/nanoc-core-4.12.6.ebuild (renamed from www-apps/nanoc-core/nanoc-core-4.11.12.ebuild)20
-rw-r--r--www-apps/nanoc-deploying/Manifest2
-rw-r--r--www-apps/nanoc-deploying/nanoc-deploying-1.0.2.ebuild27
-rw-r--r--www-apps/nanoc-spec/Manifest2
-rw-r--r--www-apps/nanoc-spec/nanoc-spec-0.0.2.ebuild2
-rw-r--r--www-apps/nanoc/Manifest4
-rw-r--r--www-apps/nanoc/nanoc-4.12.6.ebuild (renamed from www-apps/nanoc/nanoc-4.11.12.ebuild)23
-rw-r--r--www-apps/nextcloud-notify_push/Manifest2
-rw-r--r--www-apps/nextcloud-notify_push/metadata.xml4
-rw-r--r--www-apps/nextcloud/Manifest20
-rw-r--r--www-apps/nextcloud/metadata.xml4
-rw-r--r--www-apps/nextcloud/nextcloud-21.0.5.ebuild43
-rw-r--r--www-apps/nextcloud/nextcloud-22.2.6.ebuild43
-rw-r--r--www-apps/nextcloud/nextcloud-22.2.7.ebuild43
-rw-r--r--www-apps/nextcloud/nextcloud-22.2.8.ebuild (renamed from www-apps/nextcloud/nextcloud-21.0.9.ebuild)0
-rw-r--r--www-apps/nextcloud/nextcloud-23.0.5.ebuild (renamed from www-apps/nextcloud/nextcloud-23.0.3.ebuild)0
-rw-r--r--www-apps/nextcloud/nextcloud-24.0.1.ebuild (renamed from www-apps/nextcloud/nextcloud-23.0.4.ebuild)2
-rw-r--r--www-apps/nikola/Manifest6
-rw-r--r--www-apps/nikola/metadata.xml31
-rw-r--r--www-apps/nikola/nikola-8.2.2-r1.ebuild (renamed from www-apps/nikola/nikola-8.1.3.ebuild)33
-rw-r--r--www-apps/novnc/Manifest4
-rw-r--r--www-apps/novnc/novnc-1.2.0.ebuild2
-rw-r--r--www-apps/novnc/novnc-9999.ebuild4
-rw-r--r--www-apps/owncloud/Manifest8
-rw-r--r--www-apps/owncloud/owncloud-10.10.0.ebuild (renamed from www-apps/owncloud/owncloud-10.9.1.ebuild)4
-rw-r--r--www-apps/owncloud/owncloud-10.8.0.ebuild47
-rw-r--r--www-apps/owncloud/owncloud-10.9.0.ebuild47
-rw-r--r--www-apps/roundup/Manifest4
-rw-r--r--www-apps/roundup/roundup-2.0.0-r1.ebuild (renamed from www-apps/roundup/roundup-2.0.0.ebuild)4
-rw-r--r--www-apps/roundup/roundup-2.1.0-r1.ebuild (renamed from www-apps/roundup/roundup-2.1.0.ebuild)4
-rw-r--r--www-apps/rt/Manifest2
-rw-r--r--www-apps/rt/rt-4.4.4-r2.ebuild (renamed from www-apps/rt/rt-4.4.4-r1.ebuild)54
-rw-r--r--www-apps/tt-rss/Manifest3
-rw-r--r--www-apps/tt-rss/files/tt-rss-no-chmod-r2.patch26
-rw-r--r--www-apps/tt-rss/tt-rss-99999999.ebuild2
-rw-r--r--www-apps/wordpress/Manifest4
-rw-r--r--www-apps/wordpress/wordpress-6.0.ebuild (renamed from www-apps/wordpress/wordpress-5.9.3.ebuild)0
-rw-r--r--www-apps/xpra-html5/Manifest4
-rw-r--r--www-apps/xpra-html5/xpra-html5-5.0.ebuild (renamed from www-apps/xpra-html5/xpra-html5-4.5.2.ebuild)13
93 files changed, 600 insertions, 1268 deletions
diff --git a/www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3-r1.ebuild b/www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3-r2.ebuild
index 29567e33253b..2489658f8280 100644
--- a/www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3-r1.ebuild
+++ b/www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3-r2.ebuild
@@ -1,26 +1,24 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI=7
inherit depend.apache perl-module webapp
MY_P=${P/_rc/RC}
DESCRIPTION="Apache gallery for mod_perl"
-SRC_URI="http://apachegallery.dk/download/${MY_P}.tar.gz"
HOMEPAGE="http://apachegallery.dk/"
+SRC_URI="http://apachegallery.dk/download/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
KEYWORDS="amd64 ppc x86"
-IUSE=""
WEBAPP_MANUAL_SLOT="yes"
-SLOT="0"
-
-S=${WORKDIR}/${MY_P}
-DEPEND="${DEPEND}
+RDEPEND="
=dev-lang/perl-5*
=www-apache/libapreq2-2*[perl]
>=media-libs/imlib2-1.0.6-r1
@@ -29,8 +27,7 @@ DEPEND="${DEPEND}
>=dev-perl/Image-Size-2.990.0
dev-perl/Text-Template
>=dev-perl/CGI-3.08
- dev-perl/Image-Imlib2
-"
+ dev-perl/Image-Imlib2"
need_apache2
diff --git a/www-apps/Apache-Gallery/Manifest b/www-apps/Apache-Gallery/Manifest
index cf6a2bc35003..e980ef4af8d6 100644
--- a/www-apps/Apache-Gallery/Manifest
+++ b/www-apps/Apache-Gallery/Manifest
@@ -1,5 +1,5 @@
AUX 76_apache2-gallery.conf 1442 BLAKE2B 4954ca3e1c250360e2877d0a8140b83a3a0bde0f9faa793ac1113d202fa65d20fb314129e18203a9a3d61b02d5bdd9a8560073843424b1cac1ee1a11b2649471 SHA512 fb9f2c7c8d3fc38501311cdc76141326fa96ff8f9a33e8b9e9efc8ee7208fcb6168981ded323cc7851ea30f1b9ff1db3541cdd1c71a4f2c99ce9cb280efc7900
AUX postinstall-en.txt 90 BLAKE2B 9a72fe84537ed2c7f3e76f4fae32f5d80306a07e3904307ccbec32c76ec380f563e5bf6c2a6a8ef85c4df165d02396d173e75d9e9feb8afdbc4fe943c0b844f3 SHA512 3cecb9f07c69b20805a64e3184e3aea8e934d7ac7e42d53884268f7614780f25be524dafb25ae0d4ce1f9b1aed1fe88dfa27d98827182888fc36eb8301be0968
DIST Apache-Gallery-1.0RC3.tar.gz 83891 BLAKE2B 69fe688ecea1f06a9e889c62a559916736d311591001c6a4762d78abd7bdfcf92739c341426fbc290b459bd83ba6a29685cdcd6296d0a273a1f114e75ff8ebb3 SHA512 00b95d3aed844c32a5d2cf8dc736e43a017dacfad5b73c65db4e35c2bb5fa05b7ae29af8ce5bc307e7b3539d94672031e7f1abaf150f15071272b0c1fa442062
-EBUILD Apache-Gallery-1.0_rc3-r1.ebuild 1272 BLAKE2B fd987dc997cba2f541e33d68ba4154413c28e26da327256fd5c3b6c96a24a555bc7434709b8e09027ac1dcc1c92db854c858ecf44892e2b2b8a04648ca77356c SHA512 eb61341b2b11ee67551b3c7bcdecbf3878768d76a7a90ee27aadb9980c02eefd586d07d7a0d26904a6ed8165f5e9e7ca401e869d7cbe5f67f9e040722c08a918
+EBUILD Apache-Gallery-1.0_rc3-r2.ebuild 1251 BLAKE2B e7b521ba0c93bbbfeea2f64dfa40f300b8df98981f7cd5b449650970de9c2504f2cd476f6687868a9118d6f6547c71f1bc5341fc47af64c36ad9c6282fe6fca6 SHA512 90e127c4a727823cff0593ae055c463f76c6c19f885364eec304637caedc4067ee8f895afcc7a40d4fafac6c561a29e58c73fb106ed0dda8e5b30166ea4de68f
MISC metadata.xml 251 BLAKE2B f41d5969712506f1083eeb23748860a267a5cb5a66dd8b6e765f057c4ef6549bd8e314aad6f6081eacd3f11274963a46093d37a4beb95ae442fba32fe6fe5b2d SHA512 3d0c951bc2e14c38f4b3e8cf2da3fcc69e7077d4bcca59a3a48e9c69b2de759a7aca10ab736ed3d2fa96fe8254a6519f62f3f584418f0b8073281f4bdf874e3d
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 4f6b5f833baf..27b5c6cdbe64 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
Binary files differ
diff --git a/www-apps/chromedriver-bin/Manifest b/www-apps/chromedriver-bin/Manifest
index c342eafac07e..a8569f634fe4 100644
--- a/www-apps/chromedriver-bin/Manifest
+++ b/www-apps/chromedriver-bin/Manifest
@@ -1,3 +1,3 @@
-DIST chromedriver-bin-101.0.4951.41.linux64.zip 6206401 BLAKE2B f3b34bc76f6980ab16207131ff26e555b68d724c49d80b3c9350e11b31b789e7fcb0039853b04b20edba636c3e2feb18e7280e0d9a9d4afb665e6794521c0c28 SHA512 86688eac6441cc91badccc58d865d97e3f31b9fd6d160c7e88ae4ab939a53522e5c53d974f897470ca87f0556f3092267851d2de008d04faa460d15855146a7e
-EBUILD chromedriver-bin-101.0.4951.41.ebuild 605 BLAKE2B 0af8c3a8ba6b29f3ad61b6a677de768ba142fcb0f8d829f4999cd9470fa19c88dc41988b14eabc1713cf4124eb1b6a511aaac2c6758065ed38d74a2cef0e50c0 SHA512 ab772c610d30355ba0b92f0947ed1168dab40599d7c77da6e4191bca284d11e84c8f564271cc9909a0e7701c32b6d5356699fc711dc340bcb7ec6ecc8c1737d0
+DIST chromedriver-bin-103.0.5060.53.linux64.zip 7052799 BLAKE2B 4856ff4a3b5b28ae1889b482ca189fa84e6d4d471ebb8d100803923179a1178bc906947d8a67a94d54c481200dbedc4dca0cb57c269e8aaf2f5f402d3c49de77 SHA512 6f87c8b40d11d0d0505c0d1d9ba90f29b52cd23b2c22353d45efa24a780aa57d7292a085b42c330a597151f1df2bdd21dbec258f236577d874c3fb54acdbb8cd
+EBUILD chromedriver-bin-103.0.5060.53.ebuild 605 BLAKE2B 0af8c3a8ba6b29f3ad61b6a677de768ba142fcb0f8d829f4999cd9470fa19c88dc41988b14eabc1713cf4124eb1b6a511aaac2c6758065ed38d74a2cef0e50c0 SHA512 ab772c610d30355ba0b92f0947ed1168dab40599d7c77da6e4191bca284d11e84c8f564271cc9909a0e7701c32b6d5356699fc711dc340bcb7ec6ecc8c1737d0
MISC metadata.xml 461 BLAKE2B 4e6e0fd9bf732be9040a4defe4dc1ca63ba7e1ba860abfc97ad487d6220f7bc5cb1e304d001409cb866408fdf393ca42f3b95eb9b8dc258a0627aaa978f66e6e SHA512 3c9217fe5af26ee8ddc705edad8a32604d542ad60c3e78ed8aba9e08a5bd2b3508234e42710d4524149f8b7626bba08f83cb96f7f942fe5ccdfbd8bd98908bec
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-101.0.4951.41.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-103.0.5060.53.ebuild
index 7503ea84cdc5..7503ea84cdc5 100644
--- a/www-apps/chromedriver-bin/chromedriver-bin-101.0.4951.41.ebuild
+++ b/www-apps/chromedriver-bin/chromedriver-bin-103.0.5060.53.ebuild
diff --git a/www-apps/element/Manifest b/www-apps/element/Manifest
index 259a0a2b66db..a77e12d0e7a3 100644
--- a/www-apps/element/Manifest
+++ b/www-apps/element/Manifest
@@ -1,5 +1,5 @@
-DIST element-v1.10.10.tar.gz 17541812 BLAKE2B 16e59f00f9fd0d220a00093a241a36c2b1c52b745545b66c9ecb57956eaf3b27fad871faa15c19c219de8d0f111392f17ccbc34bc71c969cc08bc7333ccb7af9 SHA512 dc7ab99d93c0aae71806b176340663a5f59cddc4b00ac7ed423a689f28d812db472398f75d1e0787a2a666ac9121544e1aba41d8550f9dc34b583d852eb74dad
-DIST element-v1.10.11.tar.gz 17554189 BLAKE2B bbd61969a8d0513b311ab65a99a83b1d4d9d4b5be39a492ac57726b86a2f84e32d4e71e95601d6fb95bf9f549b81190bbd995a8b481ab23ac69d898c82cf8e2c SHA512 003f865ed5e8ab89d8427338229af944123222e5f36dac10432e7f83beef20b992746a69a39f56ecf3bcc722644eff387d663f327b558620061ec43114a1bd63
-EBUILD element-1.10.10.ebuild 733 BLAKE2B db476c59066c1360f4fe92bbfeb929e00853f79b28a8d7c18f34422fc8f4aac859ca5df21397ce4b94ff0ebdcede08eafe1584dd97d36f5e4ef31096ba785af9 SHA512 8b355b00e7500aa8529d6f2e7539e571940dbaf4200d736d549fd0da5da9f05eb2fd3cc527e8d1692067d9aa0cf709985105250b8854f5882f42bfbb97f2fc52
-EBUILD element-1.10.11.ebuild 733 BLAKE2B db476c59066c1360f4fe92bbfeb929e00853f79b28a8d7c18f34422fc8f4aac859ca5df21397ce4b94ff0ebdcede08eafe1584dd97d36f5e4ef31096ba785af9 SHA512 8b355b00e7500aa8529d6f2e7539e571940dbaf4200d736d549fd0da5da9f05eb2fd3cc527e8d1692067d9aa0cf709985105250b8854f5882f42bfbb97f2fc52
+DIST element-v1.10.14.tar.gz 17539241 BLAKE2B 37095170ebfb50c2cc70268d8d342aa60a64e7bc1e319b839208e5e2c450a757eb4f6235354427b91e48c4070b9f802a63f75fc3e502bfce8f051d902709f24c SHA512 6b849f26054568f183cfe4ce12c3729b37771f3e1c7dac9f3a22d22671cd47598b4b53f90d6e9009862e2f239411e183d94b2a56ef9422a140719910ee8dfc15
+DIST element-v1.10.15.tar.gz 17538557 BLAKE2B 3087cd7245e84ee55fdd45b041f6b36c6cc057a0db60f98bc444b07c3a8123219039fcd5c4dbe42244804c50a6c6c0246ba3561c3813dfc042f5a97ea377162e SHA512 73d2571c11b6830e67b6a20fc1f75f92f8bec289828a260a9eb0ef57eed8fbe2a2cae89233ca03fb35804e2df7f10a2345d8fc954105962f3ab61dd4bf55d79e
+EBUILD element-1.10.14.ebuild 733 BLAKE2B db476c59066c1360f4fe92bbfeb929e00853f79b28a8d7c18f34422fc8f4aac859ca5df21397ce4b94ff0ebdcede08eafe1584dd97d36f5e4ef31096ba785af9 SHA512 8b355b00e7500aa8529d6f2e7539e571940dbaf4200d736d549fd0da5da9f05eb2fd3cc527e8d1692067d9aa0cf709985105250b8854f5882f42bfbb97f2fc52
+EBUILD element-1.10.15.ebuild 733 BLAKE2B db476c59066c1360f4fe92bbfeb929e00853f79b28a8d7c18f34422fc8f4aac859ca5df21397ce4b94ff0ebdcede08eafe1584dd97d36f5e4ef31096ba785af9 SHA512 8b355b00e7500aa8529d6f2e7539e571940dbaf4200d736d549fd0da5da9f05eb2fd3cc527e8d1692067d9aa0cf709985105250b8854f5882f42bfbb97f2fc52
MISC metadata.xml 253 BLAKE2B 8557c513beef73e834b0a000c523a3241da961c6307b6e98ac857dad0888c4bbd028c98f8499f01086c24e8f2f57c64bc75db20154dab232adefc2510fccac03 SHA512 67dd372ef7b684101d9198c6199a6403f8750132d80aab4f4daa4b31ebaea3d82eb9a18e904734e2ac10c77b237d67210055949ff1c6d5aad4f75951a096884a
diff --git a/www-apps/element/element-1.10.10.ebuild b/www-apps/element/element-1.10.14.ebuild
index bdccc2ddf91f..bdccc2ddf91f 100644
--- a/www-apps/element/element-1.10.10.ebuild
+++ b/www-apps/element/element-1.10.14.ebuild
diff --git a/www-apps/element/element-1.10.11.ebuild b/www-apps/element/element-1.10.15.ebuild
index bdccc2ddf91f..bdccc2ddf91f 100644
--- a/www-apps/element/element-1.10.11.ebuild
+++ b/www-apps/element/element-1.10.15.ebuild
diff --git a/www-apps/gitea/Manifest b/www-apps/gitea/Manifest
index 9f0a1120d27e..014292608600 100644
--- a/www-apps/gitea/Manifest
+++ b/www-apps/gitea/Manifest
@@ -1,11 +1,8 @@
AUX gitea.confd-r1 243 BLAKE2B 87caa8371f53f52b0a85f720342f9f358dedec9240ab78998655a03df6bf3f301fe077afabdca1b1895dbcab2fa05748735d6f38f9b3ad53534fe8ae6e72db49 SHA512 485dc9d0b86d0a7b3ba958aac9de1129aa0ffbb47219419d38811f2accca2539e49dd93cc4a24b21f1c3802b024aa8449f54e320e8a16197f201532edeca6836
AUX gitea.initd-r3 802 BLAKE2B 2e33e95f7d2762986184d45b0bbb250cc5e04fffc4e4b006233b28e5b57be69eef1d83441adebe2b94681585edaf77f9da4eb97930f91e75c1b1a5cd8d137633 SHA512 5ff2e653180a0601734fcd055dfffdfdc12363736ed2e56c8576c802398b90f4025b44002cbb9a3fd1e0c2d4c169f62d460381c6c549746d3390e55fc1c677d1
AUX gitea.service-r3 732 BLAKE2B 8227349f9ffe5dbf7c59efc3b1e250bf8184a72d37958c0ce0a2d8affabaadcb6aaf271b1402c7ac127b80d534f4f72b888ccdce7aa5f7a7cf86a0efe0e719e0 SHA512 7c8aa33dcea56b6fccac23095f7b84225f1c85541cd5eb3536d2901e638c391e025bd9db28bd10c26ef91e5a8fe2d12a878040cf21d4b983858a19f2cac7d1b0
-DIST gitea-1.16.5.tar.gz 53178954 BLAKE2B 67c378a46eab8e374b1a5b91d86e558c6ae06e24a23cb0d670f112573e0606c3ee7f700047f703a73b19f39b216597e3a05c3602e01ecfb09f146515545d3687 SHA512 3c367155a97809d587879b023979ad198106040c362e6d5e6df26cad384c614aaac1c47d84bcac0177a5b5546c4a76e95cfff9cf76b411226c0b1aa618d4d4b3
-DIST gitea-1.16.6.tar.gz 53649707 BLAKE2B 118d77f82d2037d2d3f3a3fa9f8548af9af6fd9a8bf4797b005de9e98772899fcd73af91f135999db9136d850fc5e0283da9fc2868058e58c6f68d231e4affec SHA512 3f14aaf9fdcd21180995717c7dfebe70966073e4228520963313379f124d383192f600690c276b0a9e1d6b442e8ad053f24ffac795c13fdc6321b9200d8223ea
DIST gitea-1.16.7.tar.gz 53657579 BLAKE2B ae9d67fa633bcc5156036f033a4ed084b5b6ac0d71ec6a1ec0d0c88848233f3f0f0c22ca1c33289dc0e9950a8b299e26a88417e03643972f6721f94097b37d85 SHA512 7a31330e46078e215eecfbb2ec28373be1a176790720afbcf9674f3530d66f300d8ef9e47b9b9124cda9ce585d26d40c975e4897e5a3477dcec28b6f2b16735c
-EBUILD gitea-1.16.5.ebuild 2967 BLAKE2B b315270f9a456ca7043a60bd00254d4b69913dac08421d0a0d1c0ff6b6aa43f4f86200972b1cc70670026e900519fc6a928aaa1f1b57a31dc10edbfa107eea66 SHA512 3e2cab8768a70394fc61317460f1151a82d2c6b44fa6a680976ee6198e0226e92004f4e15980322ee5664ba01043e114b61dfc86da9ab7c96a027bd8433fa960
-EBUILD gitea-1.16.6-r1.ebuild 3177 BLAKE2B 14e26efbc4c3218d3937023755a5f83a8c13c74bc4a918c8339c864aaaa78f00f2a37010a1567375c71c43780ea9b58469160619bc5d80ff01a2c17cb2dd3a4f SHA512 69d1609cef00b20a4dfb880cf9c85b69715e7f915bf1184d82e4a7c0fe287f7b730c816b3ce99f85db7347f604986c674ae9810b27c28bed3a36ca91fd3efd3c
-EBUILD gitea-1.16.6.ebuild 2968 BLAKE2B fad3a0806c1a9f035fbf1e35e8226d5f92ba8437e1ca1f6cfb0465a0b6178e0c1a6d6c11a5574944370d4c5481f8bb545e463f90ce76148a00ffd30e28d0019c SHA512 ae5963ae218d7d68682dac4cb25bb9ffc6751ad4aa3a00438e7728798bba2ad8e1c74c8f05e095536a20136d3db598d43bf2bbe35f66b8ec7e80f5ceba96d03c
-EBUILD gitea-1.16.7.ebuild 3176 BLAKE2B ca0c1c6304f65462ed54022c43b5a3688a9dfec26c1b5f9e2d4ed43dc273065aca37b0963fdccee443a7a35ae4a7733002abd5c60780d4bacf63650036c50cd4 SHA512 8612865a06fb84aaf2ca749214b32faf1750541060b0e2b146d303d14a0b5a5673e7887444da12913bf09ebdeb51ffc9ce0fde6aaf92c418c84fb2993daa353f
-MISC metadata.xml 339 BLAKE2B 6117542b37ffbb9dc5aa2420c5846c95864b632cb35e1c69acea24d0eaed05767b0c3607a58bc9ab8e54596927072f1c7c5cb795ee44d076b7ac027d0ee65a58 SHA512 9b05184ccba06361a7dfdecced7ad53d887065763bbbc736aedc791d9089f146f99fbbd6a483bdaf47a6ee5d4965dfc2a66e6990bea1beb599baf621c2c16471
+DIST gitea-1.16.8.tar.gz 53659731 BLAKE2B ee35388d9fc5ba202d9b013e36b12771e55bc3d26256ec11ab1f1441b1db62e5b4e9972970b3f926d714edc40ac3b2e5daae47a16e2d76e4e49a1c367490cb02 SHA512 f502a07c886cc2f15615693a90eda128478d0de833cbe18993ed1f5a1a81f45591b2c00791f8024eda97d948991838b2dc95fab189695179631df47e4d587419
+EBUILD gitea-1.16.7.ebuild 3181 BLAKE2B aaf07de11af3784fc352f787542e09604950292704cb283d9474d6cec568f91a5df5104c5aa2da29f22d1324f8d4d29357ea3880a8c9d2ee29dbc685f5b83086 SHA512 a2e84529629afc73aa6649bdf3d97f5e356a97c13262dab767e1c8aaadf7c7d26ca35f201f1ae999c50d39d8ca39f62fba00e59fbcb25f01cdc52b8e08b261aa
+EBUILD gitea-1.16.8.ebuild 3295 BLAKE2B 5fb0180173ca060612256e2f2c73dcd30014a2466dc2ca65cb8e6a560af1e91888b0bb578d037aa920c8747bcce5a6035032549e3cb98fb73aac176a5da4ad7a SHA512 aa94734deb9bb13e27c831d917f848c61ab040894f2dbb6f903b1f35f5e2a67cf430d87413d347705763fcc563d0da31202147eefbb34c0b84bcc1ac5b15200c
+MISC metadata.xml 590 BLAKE2B 2313d3d6632d9d5cd758acabb539be21fed1603279719587143a96803cd89c8bf5c963d15303237130704ecf47759ea6e7e5b42ffa44bbd51c880eee6f535a20 SHA512 aec006efcfe71689dcbc5d37abfb6e566b8b637e3a3bc849cc12cddeb02d568fbfa21f55e97712b413730c2705ebc10ed7a7dc7bec4ec8c7a536457347185135
diff --git a/www-apps/gitea/gitea-1.16.5.ebuild b/www-apps/gitea/gitea-1.16.5.ebuild
deleted file mode 100644
index c213d90dc38d..000000000000
--- a/www-apps/gitea/gitea-1.16.5.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 2016-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit fcaps go-module tmpfiles systemd
-
-DESCRIPTION="A painless self-hosted Git service"
-HOMEPAGE="https://gitea.io https://github.com/go-gitea/gitea"
-SRC_URI="https://github.com/go-gitea/gitea/releases/download/v${PV}/gitea-src-${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64 ~arm ~arm64"
-S="${WORKDIR}"
-
-LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
-SLOT="0"
-IUSE="+acct pam sqlite"
-
-DEPEND="
- acct? (
- acct-group/git
- acct-user/git[gitea] )
- pam? ( sys-libs/pam )"
-RDEPEND="${DEPEND}
- dev-vcs/git"
-
-DOCS=(
- custom/conf/app.example.ini CONTRIBUTING.md README.md
-)
-FILECAPS=(
- -m 711 cap_net_bind_service+ep usr/bin/gitea
-)
-
-RESTRICT="test"
-
-src_prepare() {
- default
-
- local sedcmds=(
- -e "s#^ROOT =#ROOT = ${EPREFIX}/var/lib/gitea/gitea-repositories#"
- -e "s#^ROOT_PATH =#ROOT_PATH = ${EPREFIX}/var/log/gitea#"
- -e "s#^APP_DATA_PATH = data#APP_DATA_PATH = ${EPREFIX}/var/lib/gitea/data#"
- -e "s#^HTTP_ADDR = 0.0.0.0#HTTP_ADDR = 127.0.0.1#"
- -e "s#^MODE = console#MODE = file#"
- -e "s#^LEVEL = Trace#LEVEL = Info#"
- -e "s#^LOG_SQL = true#LOG_SQL = false#"
- -e "s#^DISABLE_ROUTER_LOG = false#DISABLE_ROUTER_LOG = true#"
- )
-
- sed -i "${sedcmds[@]}" custom/conf/app.example.ini || die
- if use sqlite ; then
- sed -i -e "s#^DB_TYPE = .*#DB_TYPE = sqlite3#" custom/conf/app.example.ini || die
- fi
-}
-
-src_compile() {
- local gitea_tags=(
- bindata
- $(usev pam)
- $(usex sqlite 'sqlite sqlite_unlock_notify' '')
- )
- local gitea_settings=(
- "-X code.gitea.io/gitea/modules/setting.CustomConf=${EPREFIX}/etc/gitea/app.ini"
- "-X code.gitea.io/gitea/modules/setting.CustomPath=${EPREFIX}/var/lib/gitea/custom"
- "-X code.gitea.io/gitea/modules/setting.AppWorkPath=${EPREFIX}/var/lib/gitea"
- )
- local makeenv=(
- DRONE_TAG="${PV}"
- LDFLAGS="-extldflags \"${LDFLAGS}\" ${gitea_settings[*]}"
- TAGS="${gitea_tags[*]}"
- )
-
- env "${makeenv[@]}" emake backend
-}
-
-src_install() {
- dobin gitea
-
- einstalldocs
-
- newconfd "${FILESDIR}/gitea.confd-r1" gitea
- newinitd "${FILESDIR}/gitea.initd-r3" gitea
- newtmpfiles - gitea.conf <<-EOF
- d /run/gitea 0755 git git
- EOF
- systemd_newunit "${FILESDIR}"/gitea.service-r3 gitea.service
-
- insinto /etc/gitea
- newins custom/conf/app.example.ini app.ini
- if use acct; then
- fowners root:git /etc/gitea/{,app.ini}
- fperms g+w,o-rwx /etc/gitea/{,app.ini}
-
- diropts -m0750 -o git -g git
- keepdir /var/lib/gitea /var/lib/gitea/custom /var/lib/gitea/data
- keepdir /var/log/gitea
- fi
-}
-
-pkg_postinst() {
- fcaps_pkg_postinst
- tmpfiles_process gitea.conf
-
- ewarn "The default JWT signing algorithm changed in 1.15.0 from HS256 (symmetric) to"
- ewarn "RS256 (asymmetric). Gitea OAuth2 tokens (and potentially client secrets) will"
- ewarn "need to be regenerated unless you change your JWT_SIGNING_ALGORITHM back to HS256."
- ewarn "For other breaking changes, see <https://github.com/go-gitea/gitea/releases/tag/v1.15.0>."
-}
diff --git a/www-apps/gitea/gitea-1.16.6.ebuild b/www-apps/gitea/gitea-1.16.6.ebuild
deleted file mode 100644
index eaeda1a3f382..000000000000
--- a/www-apps/gitea/gitea-1.16.6.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 2016-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit fcaps go-module tmpfiles systemd
-
-DESCRIPTION="A painless self-hosted Git service"
-HOMEPAGE="https://gitea.io https://github.com/go-gitea/gitea"
-SRC_URI="https://github.com/go-gitea/gitea/releases/download/v${PV}/gitea-src-${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~arm ~arm64"
-S="${WORKDIR}"
-
-LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
-SLOT="0"
-IUSE="+acct pam sqlite"
-
-DEPEND="
- acct? (
- acct-group/git
- acct-user/git[gitea] )
- pam? ( sys-libs/pam )"
-RDEPEND="${DEPEND}
- dev-vcs/git"
-
-DOCS=(
- custom/conf/app.example.ini CONTRIBUTING.md README.md
-)
-FILECAPS=(
- -m 711 cap_net_bind_service+ep usr/bin/gitea
-)
-
-RESTRICT="test"
-
-src_prepare() {
- default
-
- local sedcmds=(
- -e "s#^ROOT =#ROOT = ${EPREFIX}/var/lib/gitea/gitea-repositories#"
- -e "s#^ROOT_PATH =#ROOT_PATH = ${EPREFIX}/var/log/gitea#"
- -e "s#^APP_DATA_PATH = data#APP_DATA_PATH = ${EPREFIX}/var/lib/gitea/data#"
- -e "s#^HTTP_ADDR = 0.0.0.0#HTTP_ADDR = 127.0.0.1#"
- -e "s#^MODE = console#MODE = file#"
- -e "s#^LEVEL = Trace#LEVEL = Info#"
- -e "s#^LOG_SQL = true#LOG_SQL = false#"
- -e "s#^DISABLE_ROUTER_LOG = false#DISABLE_ROUTER_LOG = true#"
- )
-
- sed -i "${sedcmds[@]}" custom/conf/app.example.ini || die
- if use sqlite ; then
- sed -i -e "s#^DB_TYPE = .*#DB_TYPE = sqlite3#" custom/conf/app.example.ini || die
- fi
-}
-
-src_compile() {
- local gitea_tags=(
- bindata
- $(usev pam)
- $(usex sqlite 'sqlite sqlite_unlock_notify' '')
- )
- local gitea_settings=(
- "-X code.gitea.io/gitea/modules/setting.CustomConf=${EPREFIX}/etc/gitea/app.ini"
- "-X code.gitea.io/gitea/modules/setting.CustomPath=${EPREFIX}/var/lib/gitea/custom"
- "-X code.gitea.io/gitea/modules/setting.AppWorkPath=${EPREFIX}/var/lib/gitea"
- )
- local makeenv=(
- DRONE_TAG="${PV}"
- LDFLAGS="-extldflags \"${LDFLAGS}\" ${gitea_settings[*]}"
- TAGS="${gitea_tags[*]}"
- )
-
- env "${makeenv[@]}" emake backend
-}
-
-src_install() {
- dobin gitea
-
- einstalldocs
-
- newconfd "${FILESDIR}/gitea.confd-r1" gitea
- newinitd "${FILESDIR}/gitea.initd-r3" gitea
- newtmpfiles - gitea.conf <<-EOF
- d /run/gitea 0755 git git
- EOF
- systemd_newunit "${FILESDIR}"/gitea.service-r3 gitea.service
-
- insinto /etc/gitea
- newins custom/conf/app.example.ini app.ini
- if use acct; then
- fowners root:git /etc/gitea/{,app.ini}
- fperms g+w,o-rwx /etc/gitea/{,app.ini}
-
- diropts -m0750 -o git -g git
- keepdir /var/lib/gitea /var/lib/gitea/custom /var/lib/gitea/data
- keepdir /var/log/gitea
- fi
-}
-
-pkg_postinst() {
- fcaps_pkg_postinst
- tmpfiles_process gitea.conf
-
- ewarn "The default JWT signing algorithm changed in 1.15.0 from HS256 (symmetric) to"
- ewarn "RS256 (asymmetric). Gitea OAuth2 tokens (and potentially client secrets) will"
- ewarn "need to be regenerated unless you change your JWT_SIGNING_ALGORITHM back to HS256."
- ewarn "For other breaking changes, see <https://github.com/go-gitea/gitea/releases/tag/v1.15.0>."
-}
diff --git a/www-apps/gitea/gitea-1.16.7.ebuild b/www-apps/gitea/gitea-1.16.7.ebuild
index f81eddf452ee..eda894a4cb53 100644
--- a/www-apps/gitea/gitea-1.16.7.ebuild
+++ b/www-apps/gitea/gitea-1.16.7.ebuild
@@ -8,7 +8,7 @@ inherit fcaps go-module tmpfiles systemd flag-o-matic
DESCRIPTION="A painless self-hosted Git service"
HOMEPAGE="https://gitea.io https://github.com/go-gitea/gitea"
SRC_URI="https://github.com/go-gitea/gitea/releases/download/v${PV}/gitea-src-${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64 ~arm ~arm64"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
S="${WORKDIR}"
LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
diff --git a/www-apps/gitea/gitea-1.16.6-r1.ebuild b/www-apps/gitea/gitea-1.16.8.ebuild
index 249baa6f0eb7..a816c920b1b9 100644
--- a/www-apps/gitea/gitea-1.16.6-r1.ebuild
+++ b/www-apps/gitea/gitea-1.16.8.ebuild
@@ -7,8 +7,15 @@ inherit fcaps go-module tmpfiles systemd flag-o-matic
DESCRIPTION="A painless self-hosted Git service"
HOMEPAGE="https://gitea.io https://github.com/go-gitea/gitea"
-SRC_URI="https://github.com/go-gitea/gitea/releases/download/v${PV}/gitea-src-${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~arm ~arm64"
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/go-gitea/gitea.git"
+else
+ SRC_URI="https://github.com/go-gitea/gitea/releases/download/v${PV}/gitea-src-${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
S="${WORKDIR}"
LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
diff --git a/www-apps/gitea/metadata.xml b/www-apps/gitea/metadata.xml
index c5a8b29fd81a..0dd2a021ac95 100644
--- a/www-apps/gitea/metadata.xml
+++ b/www-apps/gitea/metadata.xml
@@ -1,11 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="github">go-gitea/gitea</remote-id>
- </upstream>
- <use>
- <flag name="acct">User and group management via acct-*/git packages</flag>
- </use>
+ <maintainer type="person" proxied="yes">
+ <name>Thamognya Kodi</name>
+ <email>contact@thamognya.com</email>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">go-gitea/gitea</remote-id>
+ </upstream>
+ <use>
+ <flag name="acct">User and group management via acct-*/git packages</flag>
+ </use>
</pkgmetadata>
diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index 502206b82e49..fc7d4f24fb3a 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -1,16 +1,8 @@
AUX grafana-r1.confd 870 BLAKE2B e222e17f5a14dc48f9bbc922250754d88610a951b1e6230736fffc0624a24a140bd9a9f11c6900e0f57b652ce3f334963ea453a5db5ee667863c6b69acc0f207 SHA512 cb6836ba69b9d1f0c50778823c507eaffd963341edbc4ea5409d0b068cfcecececfacac71e34b1d546a85674f67b12db99f384e5c6aa2186abe86814818d5db1
AUX grafana.initd 1498 BLAKE2B ac97391c228c09353ef11efb0de37f25802484fbbf71bccedfc9858079ca679ba1567a2a7a40e250ed1fa7477189c30b8c5f175e607b455ae755566a9d89098d SHA512 c3ef1926fabe53728adca6954eb48e8d69c33b4238795e2d0d0406e55e08b3f84760b1abfec556f258af3184e10e6fa116c1b21c704575a54f88050a5266ec87
AUX grafana.service 676 BLAKE2B 98b7e216324a451f97b9b0c2d1bbe493ea3206b8a6113f34f1064f8fde3c931c32913d4b94d77722eefe709434c3f5692b58a840066ae017f5b5f9dfd18ba9a9 SHA512 2355f708b8b5f520efa0d18c81a5e817c29953373b689b8fdd7c3f722f9b4d566d2e8329434daf2268d24fb2ff563b80ad84b144855a67abcf96c2b7b910b31c
-DIST grafana-bin-7.5.15.tar.gz 52222968 BLAKE2B 0d1d0282eb4cbd8a91c1719b2085ff78c5dfccdb751fdb005191a493b1885286834e64dfa9dacde989ef682a2243234cea572708122438d988e16838bfc1adff SHA512 0c94d36dd51386f7ebd88227df7a600e6e5ea2f4bcf3acbc819460cec717fa8fa75d93db72a7d272a6177ef235c061dc251439d25a9e4df2db3b395c647f6f0e
-DIST grafana-bin-8.3.5.tar.gz 72641356 BLAKE2B a75e20de51f0b2346bc504a0c65a14e818697d346352f51197edb1d783db4d234b65cf09c7915d6f2e902f0e4e65076cac723453e9fc7d2fc78b8d5316b4a25d SHA512 ce8afd0da6e7f0e712cb181a6c1ac4ff95cb0349862da673c547eb2ce4426d7fa1402f7fbf3cfa56b5b1006788864f0a54fbbca4b29c456b6c6ca4a5862bc9da
-DIST grafana-bin-8.3.7.tar.gz 72682810 BLAKE2B e7ceb64d3caaf3fcf02aba8beaf1cde9d66f25b673752fb342f74c2e2bd2f60cd60771ede6f2401fe0e2e2b345457d2d2e6d2b3f19532a2f393528cf21b4b594 SHA512 57e6c25698db943b5eca15b588f50bb01d30e88d227ba6499c5fcd8df185a8e6e6f799cba0c0953efc397b04315ffa755193cc7a90197e5cd93375481d999fe1
-DIST grafana-bin-8.4.4.tar.gz 74258533 BLAKE2B 9635e39f816c88c7573eda4e6309c2958adc08585b3cb5da94f9ca95b3c7c15a9c048e06e3594a394bf7831b28476f406ff748330c386716aee62e67c266b201 SHA512 1977e031234e4fd24de87b6d34ae012851575fd51a668e172b6e8b8a490019f162dac376beb492d31b76dcc15dc8e9a8546b3e1a85b23945308281ab688d19ee
-DIST grafana-bin-8.4.7.tar.gz 75609875 BLAKE2B 157e1c0ee3ac49d817004da9484097d960e900f6727a1fd4e3386d6573a88e72e5477e4085b3e12659fc3ac295ce77adbace708f0dabc787eab88a1432a2617b SHA512 663a78cb2e51e0d95e1bc0e03faacc8f0c0ab666154adcc465c6b0f3ddc2a2fa7e73acff9a74b95a6a9865c041499397e74a081cec2686973b1acdc33a19e802
-DIST grafana-bin-8.5.2.tar.gz 77679732 BLAKE2B 7ae347eed09074f840b0bf0a663fc893c07cb8b97f0dda4fce5f5e7a75fffd875327efdc2dbcf16e6af00228bdd62e39328c30c2968ea48369a9eeb565b21b6b SHA512 0d1afdc8c4a1f09a3005a321cbf1647f8aca4b508a2041f21d7477fc041cdf348944f5b3473084beff5993f3c7e9b2da2fad321066dea9f34294bf023ff1cf01
-EBUILD grafana-bin-7.5.15.ebuild 1769 BLAKE2B 5eeb7b9385f4bf3f453f634cadb0b26f16cbafdadae1131652fdae2dcc21243a655403e7f5d222ef254acdb42ba814af82819f5a618c4e0f338bf90c74128404 SHA512 c00131c4f3938c6fa65f227cb012c37f717f1205269216c4eca6df1cf647168aef7ab91483fffa3c464cdaae0f8d030aaed30d7cf51c38498269f57b59b9fa7f
-EBUILD grafana-bin-8.3.5.ebuild 1769 BLAKE2B 5eeb7b9385f4bf3f453f634cadb0b26f16cbafdadae1131652fdae2dcc21243a655403e7f5d222ef254acdb42ba814af82819f5a618c4e0f338bf90c74128404 SHA512 c00131c4f3938c6fa65f227cb012c37f717f1205269216c4eca6df1cf647168aef7ab91483fffa3c464cdaae0f8d030aaed30d7cf51c38498269f57b59b9fa7f
-EBUILD grafana-bin-8.3.7.ebuild 1769 BLAKE2B 5eeb7b9385f4bf3f453f634cadb0b26f16cbafdadae1131652fdae2dcc21243a655403e7f5d222ef254acdb42ba814af82819f5a618c4e0f338bf90c74128404 SHA512 c00131c4f3938c6fa65f227cb012c37f717f1205269216c4eca6df1cf647168aef7ab91483fffa3c464cdaae0f8d030aaed30d7cf51c38498269f57b59b9fa7f
-EBUILD grafana-bin-8.4.4.ebuild 1769 BLAKE2B 5eeb7b9385f4bf3f453f634cadb0b26f16cbafdadae1131652fdae2dcc21243a655403e7f5d222ef254acdb42ba814af82819f5a618c4e0f338bf90c74128404 SHA512 c00131c4f3938c6fa65f227cb012c37f717f1205269216c4eca6df1cf647168aef7ab91483fffa3c464cdaae0f8d030aaed30d7cf51c38498269f57b59b9fa7f
-EBUILD grafana-bin-8.4.7.ebuild 1769 BLAKE2B 5eeb7b9385f4bf3f453f634cadb0b26f16cbafdadae1131652fdae2dcc21243a655403e7f5d222ef254acdb42ba814af82819f5a618c4e0f338bf90c74128404 SHA512 c00131c4f3938c6fa65f227cb012c37f717f1205269216c4eca6df1cf647168aef7ab91483fffa3c464cdaae0f8d030aaed30d7cf51c38498269f57b59b9fa7f
-EBUILD grafana-bin-8.5.2.ebuild 1769 BLAKE2B 5eeb7b9385f4bf3f453f634cadb0b26f16cbafdadae1131652fdae2dcc21243a655403e7f5d222ef254acdb42ba814af82819f5a618c4e0f338bf90c74128404 SHA512 c00131c4f3938c6fa65f227cb012c37f717f1205269216c4eca6df1cf647168aef7ab91483fffa3c464cdaae0f8d030aaed30d7cf51c38498269f57b59b9fa7f
+DIST grafana-bin-7.5.16.tar.gz 52223732 BLAKE2B 58cb72fb432049964bf225e483e0278c055cbce4b6c559f389f8a512d3955a1ad3eae167ca1e80225043a56165b6e9331bde982f81c6db624fb4e60deff4d10a SHA512 c422533467205b2b038372ef1c5f046a9df477b76d0e79511d10286f040647216439d635f6b504ac09c24a9128347bdc5fa9355faae0abe630f7bda98c1c3f7b
+DIST grafana-bin-8.5.3.tar.gz 77677429 BLAKE2B 3f362d3c8815a22c248f405c1f606901980b227e82d67ab3dc0890df2f9b774e37d9fb189b0276483bfbc12d36c47da24e598956f29c2f2738bb9ca7ab617b2c SHA512 05f27b95d9daadb4f2c82a4606407bea0a3bdc6f29e5645ef9ca40533cda617bacc91c7d119c8d133abf180603ed4c881d4c207b83d2e5c19d35bd5ba2c0efd8
+EBUILD grafana-bin-7.5.16.ebuild 1769 BLAKE2B 5eeb7b9385f4bf3f453f634cadb0b26f16cbafdadae1131652fdae2dcc21243a655403e7f5d222ef254acdb42ba814af82819f5a618c4e0f338bf90c74128404 SHA512 c00131c4f3938c6fa65f227cb012c37f717f1205269216c4eca6df1cf647168aef7ab91483fffa3c464cdaae0f8d030aaed30d7cf51c38498269f57b59b9fa7f
+EBUILD grafana-bin-8.5.3.ebuild 1769 BLAKE2B 5eeb7b9385f4bf3f453f634cadb0b26f16cbafdadae1131652fdae2dcc21243a655403e7f5d222ef254acdb42ba814af82819f5a618c4e0f338bf90c74128404 SHA512 c00131c4f3938c6fa65f227cb012c37f717f1205269216c4eca6df1cf647168aef7ab91483fffa3c464cdaae0f8d030aaed30d7cf51c38498269f57b59b9fa7f
MISC metadata.xml 219 BLAKE2B e366b8552425c0b7293381e047210130af3c96a6be5877911f2e3ee77b0c80a475854ec7d59e1a5dea75e9d07cefcb3636947fa0af121357cfe7db12e05e6c34 SHA512 b5fce0d3f0f5fa2729808fad339e6843c6bdf814451d2b65b9b67b4b715194e6de20ad2702c9b5a08d260c97641ab9478d978486e702d85034cfb95d7ceab954
diff --git a/www-apps/grafana-bin/grafana-bin-7.5.15.ebuild b/www-apps/grafana-bin/grafana-bin-7.5.16.ebuild
index b15b8f8775d4..b15b8f8775d4 100644
--- a/www-apps/grafana-bin/grafana-bin-7.5.15.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-7.5.16.ebuild
diff --git a/www-apps/grafana-bin/grafana-bin-8.3.7.ebuild b/www-apps/grafana-bin/grafana-bin-8.3.7.ebuild
deleted file mode 100644
index b15b8f8775d4..000000000000
--- a/www-apps/grafana-bin/grafana-bin-8.3.7.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd
-
-MY_PN=${PN/-bin/}
-MY_PV=${PV/_beta/-beta}
-S=${WORKDIR}/${MY_PN}-${MY_PV}
-
-DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
-HOMEPAGE="https://grafana.org"
-SRC_URI="https://dl.grafana.com/oss/release/grafana-${PV}.linux-amd64.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="acct-group/grafana
- acct-user/grafana"
-RDEPEND="${DEPEND}
- media-libs/fontconfig"
-
-QA_PREBUILT="usr/bin/grafana-*"
-QA_PRESTRIPPED=${QA_PREBUILT}
-
-src_install() {
- keepdir /etc/grafana
- insinto /etc/grafana
- newins "${S}"/conf/sample.ini grafana.ini
- rm "${S}"/conf/sample.ini || die
-
- # Frontend assets
- insinto /usr/share/${MY_PN}
- doins -r public conf
-
- dobin bin/grafana-cli
- dobin bin/grafana-server
-
- newconfd "${FILESDIR}"/grafana-r1.confd grafana
- newinitd "${FILESDIR}"/grafana.initd grafana
- systemd_newunit "${FILESDIR}"/grafana.service grafana.service
-
- keepdir /var/{lib,log}/grafana
- keepdir /var/lib/grafana/{dashboards,plugins}
- fowners grafana:grafana /var/{lib,log}/grafana
- fowners grafana:grafana /var/lib/grafana/{dashboards,plugins}
- fperms 0750 /var/{lib,log}/grafana
- fperms 0750 /var/lib/grafana/{dashboards,plugins}
-}
-
-postinst() {
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- # This is a new installation
-
- elog "${PN} has built-in log rotation. Please see [log.file] section of"
- elog "/etc/grafana/grafana.ini for related settings."
- elog
- elog "You may add your own custom configuration for app-admin/logrotate if you"
- elog "wish to use external rotation of logs. In this case, you also need to make"
- elog "sure the built-in rotation is turned off."
- fi
-}
diff --git a/www-apps/grafana-bin/grafana-bin-8.4.4.ebuild b/www-apps/grafana-bin/grafana-bin-8.4.4.ebuild
deleted file mode 100644
index b15b8f8775d4..000000000000
--- a/www-apps/grafana-bin/grafana-bin-8.4.4.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd
-
-MY_PN=${PN/-bin/}
-MY_PV=${PV/_beta/-beta}
-S=${WORKDIR}/${MY_PN}-${MY_PV}
-
-DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
-HOMEPAGE="https://grafana.org"
-SRC_URI="https://dl.grafana.com/oss/release/grafana-${PV}.linux-amd64.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="acct-group/grafana
- acct-user/grafana"
-RDEPEND="${DEPEND}
- media-libs/fontconfig"
-
-QA_PREBUILT="usr/bin/grafana-*"
-QA_PRESTRIPPED=${QA_PREBUILT}
-
-src_install() {
- keepdir /etc/grafana
- insinto /etc/grafana
- newins "${S}"/conf/sample.ini grafana.ini
- rm "${S}"/conf/sample.ini || die
-
- # Frontend assets
- insinto /usr/share/${MY_PN}
- doins -r public conf
-
- dobin bin/grafana-cli
- dobin bin/grafana-server
-
- newconfd "${FILESDIR}"/grafana-r1.confd grafana
- newinitd "${FILESDIR}"/grafana.initd grafana
- systemd_newunit "${FILESDIR}"/grafana.service grafana.service
-
- keepdir /var/{lib,log}/grafana
- keepdir /var/lib/grafana/{dashboards,plugins}
- fowners grafana:grafana /var/{lib,log}/grafana
- fowners grafana:grafana /var/lib/grafana/{dashboards,plugins}
- fperms 0750 /var/{lib,log}/grafana
- fperms 0750 /var/lib/grafana/{dashboards,plugins}
-}
-
-postinst() {
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- # This is a new installation
-
- elog "${PN} has built-in log rotation. Please see [log.file] section of"
- elog "/etc/grafana/grafana.ini for related settings."
- elog
- elog "You may add your own custom configuration for app-admin/logrotate if you"
- elog "wish to use external rotation of logs. In this case, you also need to make"
- elog "sure the built-in rotation is turned off."
- fi
-}
diff --git a/www-apps/grafana-bin/grafana-bin-8.4.7.ebuild b/www-apps/grafana-bin/grafana-bin-8.4.7.ebuild
deleted file mode 100644
index b15b8f8775d4..000000000000
--- a/www-apps/grafana-bin/grafana-bin-8.4.7.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd
-
-MY_PN=${PN/-bin/}
-MY_PV=${PV/_beta/-beta}
-S=${WORKDIR}/${MY_PN}-${MY_PV}
-
-DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
-HOMEPAGE="https://grafana.org"
-SRC_URI="https://dl.grafana.com/oss/release/grafana-${PV}.linux-amd64.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="acct-group/grafana
- acct-user/grafana"
-RDEPEND="${DEPEND}
- media-libs/fontconfig"
-
-QA_PREBUILT="usr/bin/grafana-*"
-QA_PRESTRIPPED=${QA_PREBUILT}
-
-src_install() {
- keepdir /etc/grafana
- insinto /etc/grafana
- newins "${S}"/conf/sample.ini grafana.ini
- rm "${S}"/conf/sample.ini || die
-
- # Frontend assets
- insinto /usr/share/${MY_PN}
- doins -r public conf
-
- dobin bin/grafana-cli
- dobin bin/grafana-server
-
- newconfd "${FILESDIR}"/grafana-r1.confd grafana
- newinitd "${FILESDIR}"/grafana.initd grafana
- systemd_newunit "${FILESDIR}"/grafana.service grafana.service
-
- keepdir /var/{lib,log}/grafana
- keepdir /var/lib/grafana/{dashboards,plugins}
- fowners grafana:grafana /var/{lib,log}/grafana
- fowners grafana:grafana /var/lib/grafana/{dashboards,plugins}
- fperms 0750 /var/{lib,log}/grafana
- fperms 0750 /var/lib/grafana/{dashboards,plugins}
-}
-
-postinst() {
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- # This is a new installation
-
- elog "${PN} has built-in log rotation. Please see [log.file] section of"
- elog "/etc/grafana/grafana.ini for related settings."
- elog
- elog "You may add your own custom configuration for app-admin/logrotate if you"
- elog "wish to use external rotation of logs. In this case, you also need to make"
- elog "sure the built-in rotation is turned off."
- fi
-}
diff --git a/www-apps/grafana-bin/grafana-bin-8.5.2.ebuild b/www-apps/grafana-bin/grafana-bin-8.5.2.ebuild
deleted file mode 100644
index b15b8f8775d4..000000000000
--- a/www-apps/grafana-bin/grafana-bin-8.5.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd
-
-MY_PN=${PN/-bin/}
-MY_PV=${PV/_beta/-beta}
-S=${WORKDIR}/${MY_PN}-${MY_PV}
-
-DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
-HOMEPAGE="https://grafana.org"
-SRC_URI="https://dl.grafana.com/oss/release/grafana-${PV}.linux-amd64.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="acct-group/grafana
- acct-user/grafana"
-RDEPEND="${DEPEND}
- media-libs/fontconfig"
-
-QA_PREBUILT="usr/bin/grafana-*"
-QA_PRESTRIPPED=${QA_PREBUILT}
-
-src_install() {
- keepdir /etc/grafana
- insinto /etc/grafana
- newins "${S}"/conf/sample.ini grafana.ini
- rm "${S}"/conf/sample.ini || die
-
- # Frontend assets
- insinto /usr/share/${MY_PN}
- doins -r public conf
-
- dobin bin/grafana-cli
- dobin bin/grafana-server
-
- newconfd "${FILESDIR}"/grafana-r1.confd grafana
- newinitd "${FILESDIR}"/grafana.initd grafana
- systemd_newunit "${FILESDIR}"/grafana.service grafana.service
-
- keepdir /var/{lib,log}/grafana
- keepdir /var/lib/grafana/{dashboards,plugins}
- fowners grafana:grafana /var/{lib,log}/grafana
- fowners grafana:grafana /var/lib/grafana/{dashboards,plugins}
- fperms 0750 /var/{lib,log}/grafana
- fperms 0750 /var/lib/grafana/{dashboards,plugins}
-}
-
-postinst() {
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- # This is a new installation
-
- elog "${PN} has built-in log rotation. Please see [log.file] section of"
- elog "/etc/grafana/grafana.ini for related settings."
- elog
- elog "You may add your own custom configuration for app-admin/logrotate if you"
- elog "wish to use external rotation of logs. In this case, you also need to make"
- elog "sure the built-in rotation is turned off."
- fi
-}
diff --git a/www-apps/grafana-bin/grafana-bin-8.3.5.ebuild b/www-apps/grafana-bin/grafana-bin-8.5.3.ebuild
index b15b8f8775d4..b15b8f8775d4 100644
--- a/www-apps/grafana-bin/grafana-bin-8.3.5.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-8.5.3.ebuild
diff --git a/www-apps/hugo/Manifest b/www-apps/hugo/Manifest
index f632bfe4ae09..fc0b5fb3ba17 100644
--- a/www-apps/hugo/Manifest
+++ b/www-apps/hugo/Manifest
@@ -1,13 +1,11 @@
-AUX hugo-0.92.2-link-to-webp-and-sass.patch 1426 BLAKE2B 7a518995b6f691dea6ec06e42f39d785d8b82da25a8cc5f129df0efdc0beb36fdb66084f810f6db74a2f21dadd146cdfe47da8f7917b68647b4f36da32bfb396 SHA512 64c8ef2b80fad93caca8f67632f6ce77cbcf797cc0f2f97c871d6064acd88d2ab656b35c8500fd86a00c07a955ce7298227a4f829e7507975230ea84b8afc500
AUX hugo-0.96.0-skip-some-tests.patch 4082 BLAKE2B fe22f1c7fe5dd023c21f45b1dca71b50bb51d9ed993687fa7c654b0e0c3b59f760c4270393e7abf46c84db6d9c1e62d56bd2851541ebfd40ac2abd92c132e6e2 SHA512 8be454a559aba28022ea09003dfdac8701f86edd5805f5b15349e1bd8295aacdf81cc8522b250d7fde24b485303e277ab15bd004aba6a2a0ca2717ae824c33ca
AUX hugo-0.96.0-unbundle-libwebp-and-libsass.patch 1558 BLAKE2B bce42fce63466424c0e3b2f7f099485cb23ea0e756fe57dfa1a062f9e0afb6ca3213d5b3048c6482e557c8399b392deaca53281866cd8d160ea20e81cb133c89 SHA512 a0ea32e10112047dd3a4536286c853c97d43c548ed4cfaa366711c45ff67960545b317f67fb2f69484b61dabe8d668a0540339a4789f43f8581afe11d611c538
-DIST hugo-0.93.3-vendor.tar.xz 4828092 BLAKE2B 4df3e876ffcc71f4caa089512510bec47f9e3aa25240ed6cc9ed9e7faef7425b3f7bdd03293023f103a0b8927ecbdf7fe3d9f36f5a66db580dfc8f0ddb9dc310 SHA512 6c93a8435552553079e856f8a74eef76e23ab7343e6e65ac83f9f1675c5fe44547f5d3f700656c0e666bc668792be38e343cfaebbfb23b5ece28ddfa0896755c
-DIST hugo-0.93.3.tar.gz 27852078 BLAKE2B 8e21fcbacc55cb304314d24f7a1258c9192655cb603e33c2ac2cac5fcc21f83045c1fc3a3ee7bd227507fd08be54e15dcd9cc9629e320bae9b41f1c87d03e163 SHA512 c65cc776588604a6ca2fbe5c4081db252ec007311eae54ed81ea65e983f1787edf6e10774d8ace82284eb7c42f6cb70650135ec44b2ddc8994ed511ba2a7d55e
-DIST hugo-0.96.0-vendor.tar.xz 4721504 BLAKE2B d8516c848be292f2097961a599450b719b2d760ad3464036929a0937ae6b401ec4b7b90df3281f11a70c4f9a7e94d74e821d78639b9cb3a335a59c5f6e645e65 SHA512 d58cbded19c5e2595838725a181e5fcdad94888f1e140e8961d9815c17d7719644483bb9bb34141c26bfccd87412632b1c896c12b85abb76c6448de3d0c8642d
-DIST hugo-0.96.0.tar.gz 27853655 BLAKE2B 8161eb31b66a9643e31967629852475496dcabd0ef04e806f0d004f3933de07553a10572c201f8b798c7c257d20d7e0e6381bb2892728f89fd3416cc768d76f2 SHA512 1dc5e9f433953a1ae378d0eeb24e0647a4c096db96a727ece39c1c4e5d3ef40033ca61aa7a9ed322234e41a116f118115e637c0342b52ee60fe47eea5718ffde
-DIST hugo-0.98.0-vendor.tar.xz 5675060 BLAKE2B d876207dfc7c13ff97249bf72bf5191a0d4adbf82af38b8962a8e66d922f5bdf5298c8ecddb05c8a1d13f95f9e8bbbb84dec8cc37538ad47d8d83da951dfa003 SHA512 7b67920c8adcc8aea3a3dd6880716a79df8081cca17bf2d8cbd0ca3861aa69c29b0320eb86e0942db32e362b22faaade7cb65c9a0e0f88578504bfe4ed666d63
-DIST hugo-0.98.0.tar.gz 27716005 BLAKE2B b3cbc9c616eb79a993bd9ddf07658ff1d3ce0680d3788e37cab78dfb48b33a259514b417d3e657afe89f188b3c0c03b88108dbcbd44d80c4d97004f7aa0185b0 SHA512 9d8a65c49be5b7bb181627bd8b557ddc041dc00a673ac0af8aeacbbfc46441a0045a5ab531087fb866d076297d67823a2eb5b14f57f3ecf57cc7b9e6b90ddf3a
-EBUILD hugo-0.93.3.ebuild 1887 BLAKE2B f0351fc4bc20ed692378b5a8ad6ebb5622971ffca2832e50b21b39592e9dc891b8cdf4e8c7aa01cb349bfb39db9070ee8f768b17a8d30b774cec4b98f4693347 SHA512 0b345e1b12d4488660f3c8ab1baef7e886ccb57bb49c3ee177f902fafd1e9f5e2affbaeeb195f5537dfe8179f2d8fe081906343c05fe6c9e9ed5a515ab248416
-EBUILD hugo-0.96.0.ebuild 1993 BLAKE2B 8f4e9fd025c5b55911c1313144069bae7e3bac29008901937026513867a867d87067ee3b7e668d20640e062042fe58811e9f3fb77eb3ef6cd1721323e3f0b306 SHA512 2faae5f367ac1d83b851bc8a042ab8da3363e359a359e8d84fddb93690f396b82d8775a9156bcbd6c5e5a930fa279573a7f8b37be89105eec2ad435c48a18870
-EBUILD hugo-0.98.0.ebuild 2000 BLAKE2B 88f98e70ae87ba9bd50cea3abeecefdfe79990aaab98fb07dde14736164a74513f256a2ca2875bec3056985db96fb16979bca0e6b3335df72a7d00bb681f9cb0 SHA512 fb60f6591a2ebf1f13293d012a575317ac5c427ecd8677fff9cb0489684656435ef55e9c820e528589bea107bcc7022c3b0cb92268588e5a2c023522f9ae9758
-MISC metadata.xml 806 BLAKE2B 94596b9097f4f1277d81c88292eecfaab2480476807edf680350158e704226d335787029f7e898c6cc6ad0452af4266d2aedcfa38209201b48cde75efa88965e SHA512 26e3674ec6775f073d0e10f87b9bbc8364e0c4d1e946a415002bdc11aa62909b2792c6cb7a90ac163860e569fdf6ed303173887c214531f50ae63dc0f9b4e69e
+AUX hugo-0.99.1-fix-testdecodeconfig-basic.patch 1694 BLAKE2B a751d9b4123c48bd8e5e2a6d05f36e6f89793a47ef17093f6b4abb2cdf92d584ca889bf9fd80ccfafa4093ea0410b79db214e703a0a4017bea61d323d78da668 SHA512 43871d36ba3e0fdbc5655d4b5a22de508430888621314bf00ee75bdd95f32e2992803cab606e6e1c17952dc1dd6701cdf84b30307f1af70a40b619fd6cd7660c
+AUX hugo-0.99.1-test-timeout.patch 731 BLAKE2B 677a6ca363f60b875d672df80584734a5feabecea68de57cfe63ebfb97768581372adbe2d171e0f5f746a03b8dc67fad75bd1c0a3bdcb9532f99c1859b31523f SHA512 979161805cc5b7220362b7fefe33d423515b76a366b08500b9765c835399aacff3ff609d6692594739a3f9a078b1708dbfc1c6635416d46d0d8a1279e50417ac
+DIST hugo-0.101.0-vendor.tar.xz 5682852 BLAKE2B 130cf9fda4d857e69144147e408a90fd28273d42919c4ea50228b795b7c35f9641857f642be8628b947b213ee42f11f468ca76317d4742d09c60bc5a272e83ff SHA512 07390ebb9daf2097010013f5e7c789f3fcee485952968b0934cc5d625eec9a79784ccda1414e59a21073b66389c75888704f923675f255df5eaa0d43c0cc3048
+DIST hugo-0.101.0.tar.gz 28130925 BLAKE2B ff35c48c39dac61abe56ba4f75bfddcdda700b71157dc4ed75f1c3724b11b8a9f4546e94d3105a724a5493b3baa73056a55d9d90e87ce4237e39213995db636d SHA512 541d0e04e868845119f2b488fd53b92929ea4dc08685d438a2914b41586e204588b193522013e8eed908dc0c3fbc2714aefb1afad0beae875d57d71aadc59c70
+DIST hugo-0.99.1-vendor.tar.xz 5675228 BLAKE2B 80fdd25fe924bcde7f200b805bf6598dbb726bb628b82e9b0d2809414a7a6e33cbfe069e29953e75b8ed4ecdb9c7303b44a8d8195b43540977cd7461295de109 SHA512 88ffb6bea777e3a72dac05941de542acdc6a17faff9e98517e483e17c7a42d1ab5aa7e65ed3a91f6832468d2da3e98e87346118694a8e20f6375fad56d5d7ff0
+DIST hugo-0.99.1.tar.gz 27721831 BLAKE2B 951840055b345f87cca287ad6391787290296dab44ba2295a49e98c6e93ecb344e9591137e8fdd34d7182e2ec334e36b5ff5ebfd17c3f973dbe31d9444d7bf38 SHA512 cebdad62493b1f734fd0346d94f1480a597ea38bf984d8e91a2ae63a4083c1671d81f289a4396a1e1a2c973c8733eba95623dd7d50c31b8c4b096576a06ae03b
+EBUILD hugo-0.101.0.ebuild 2021 BLAKE2B 86987c3f36a0ffd739ed290112abf2ec2aad96dd757908fcc441282dcb769b988447ad85ae12a6a98d79b067e152a0d005d959ffc214a4f21809ffc0dc4e6b08 SHA512 e4404df8770db2a2527230170a5fbaaf8eb39e7b7f283a138f51021745315acd75801c4931f078d4c929022c9b76146b4d9b697ceb0ab10af6cf7ddb4fed6a83
+EBUILD hugo-0.99.1.ebuild 2082 BLAKE2B f594d9989b55ecfbd73c866ffcfa775bd97f6a50611a85f328690ccab8d37c16e73062f75b5fdf3390b0d9b8ae07584c064a4ac9c8b70fa06611571f211d5dd2 SHA512 1627ac0c42d5c3589cb042f8354c62d27045fbcef7193031e83987943432e10243e2829fc3d26fe24026fc78984460094aa5646c5e5651b2551eb47f472151cf
+MISC metadata.xml 727 BLAKE2B b2632867dbfc5f0d647facb43f54ad3ae6bf5562bc7057dafca2724b4da8574603fff3ab5acf9ce9acb5dd0e20a15bcc052ee1cb5ca3b44d5e02f443c7d9ea2d SHA512 6efed4943de9dd760aac8998fa921d9e38f3ab93baae7c1a808e102619e292d7a067e6fe7c102b89fc432d422d2c8614b339490c5e234210bb219eeca22c6540
diff --git a/www-apps/hugo/files/hugo-0.92.2-link-to-webp-and-sass.patch b/www-apps/hugo/files/hugo-0.92.2-link-to-webp-and-sass.patch
deleted file mode 100644
index bda6f9bcc3f2..000000000000
--- a/www-apps/hugo/files/hugo-0.92.2-link-to-webp-and-sass.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From b1c99224dc0d318109832531c98ec24ef4c0020e Mon Sep 17 00:00:00 2001
-From: tastytea <tastytea@tastytea.de>
-Date: Wed, 23 Feb 2022 14:00:36 +0100
-Subject: [PATCH] Link to webp and sass
-
-We need to add the flags because we unbundle media-libs/libwebp and
-dev-libs/libsass.
----
- vendor/github.com/bep/golibsass/internal/libsass/a__cgo.go | 2 +-
- vendor/github.com/bep/gowebp/internal/libwebp/a__cgo.go | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/vendor/github.com/bep/golibsass/internal/libsass/a__cgo.go b/vendor/github.com/bep/golibsass/internal/libsass/a__cgo.go
-index af51b92..979d9e7 100644
---- a/vendor/github.com/bep/golibsass/internal/libsass/a__cgo.go
-+++ b/vendor/github.com/bep/golibsass/internal/libsass/a__cgo.go
-@@ -8,6 +8,6 @@ package libsass
- // #cgo CFLAGS: -O2 -fPIC
- // #cgo CPPFLAGS: -I../../libsass_src/include
- // #cgo CXXFLAGS: -g -std=c++0x -O2 -fPIC
--// #cgo LDFLAGS: -lstdc++ -lm
-+// #cgo LDFLAGS: -lstdc++ -lm -lsass
- // #cgo darwin linux LDFLAGS: -ldl
- import "C"
-diff --git a/vendor/github.com/bep/gowebp/internal/libwebp/a__cgo.go b/vendor/github.com/bep/gowebp/internal/libwebp/a__cgo.go
-index 4b105ab..cec2faa 100644
---- a/vendor/github.com/bep/gowebp/internal/libwebp/a__cgo.go
-+++ b/vendor/github.com/bep/gowebp/internal/libwebp/a__cgo.go
-@@ -2,5 +2,5 @@
-
- package libwebp
-
--// #cgo linux LDFLAGS: -lm
-+// #cgo linux LDFLAGS: -lm -lwebp
- import "C"
---
-2.34.1
-
diff --git a/www-apps/hugo/files/hugo-0.99.1-fix-testdecodeconfig-basic.patch b/www-apps/hugo/files/hugo-0.99.1-fix-testdecodeconfig-basic.patch
new file mode 100644
index 000000000000..5221b86c04fa
--- /dev/null
+++ b/www-apps/hugo/files/hugo-0.99.1-fix-testdecodeconfig-basic.patch
@@ -0,0 +1,39 @@
+# Upstream commit: https://github.com/gohugoio/hugo/commit/52edea0
+# Trimmed down to patch only the stuff we need.
+
+From 52edea0feccf98700300e98567c5a2ada7604c89 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?=
+ <bjorn.erik.pedersen@gmail.com>
+Date: Fri, 27 May 2022 10:06:45 +0200
+Subject: [PATCH] github: Set HUGO_BUILD_TAGS: extended when running tests
+
+Also fix TestDecodeConfig/Basic which started to fail in the extended build in 0.99.1.
+
+Closes #9935
+---
+diff --git a/modules/config_test.go b/modules/config_test.go
+index 55d055dcc7d..371aab05617 100644
+--- a/modules/config_test.go
++++ b/modules/config_test.go
+@@ -48,7 +48,7 @@ func TestDecodeConfig(t *testing.T) {
+
+ [module.hugoVersion]
+ min = "0.54.2"
+-max = "0.99.0"
++max = "0.199.0"
+ extended = true
+
+ [[module.mounts]]
+diff --git a/resources/resource_transformers/tocss/scss/integration_test.go b/resources/resource_transformers/tocss/scss/integration_test.go
+index 72c0fd988e9..13b664cc723 100644
+--- a/resources/resource_transformers/tocss/scss/integration_test.go
++++ b/resources/resource_transformers/tocss/scss/integration_test.go
+@@ -236,7 +236,7 @@ T1: {{ $r.Content }}
+ }).BuildE()
+
+ b.Assert(err, qt.IsNotNil)
+- b.Assert(err.Error(), qt.Contains, filepath.FromSlash(`assets/scss/components/_foo.scss:2:1": expected ':' after $foocolor in assignment statement`))
++ b.Assert(err.Error(), qt.Contains, `assets/scss/components/_foo.scss:2:1": expected ':' after $foocolor in assignment statement`)
+ fe := b.AssertIsFileError(err)
+ b.Assert(fe.ErrorContext(), qt.IsNotNil)
+ b.Assert(fe.ErrorContext().Lines, qt.DeepEquals, []string{"/* comment line 1 */", "$foocolor #ccc;", "", "foo {"})
diff --git a/www-apps/hugo/files/hugo-0.99.1-test-timeout.patch b/www-apps/hugo/files/hugo-0.99.1-test-timeout.patch
new file mode 100644
index 000000000000..dc0f4898fcf6
--- /dev/null
+++ b/www-apps/hugo/files/hugo-0.99.1-test-timeout.patch
@@ -0,0 +1,25 @@
+From 92ceabab139262750cc6b61ffc3a6341dedfbbd4 Mon Sep 17 00:00:00 2001
+From: tastytea <tastytea@tastytea.de>
+Date: Wed, 8 Jun 2022 04:10:27 +0200
+Subject: [PATCH] Set default test timeout to 2 minutes
+
+Bug: https://bugs.gentoo.org/850313
+---
+ config/configProvider.go | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/config/configProvider.go b/config/configProvider.go
+index 01a2e8c5..c8f199eb 100644
+--- a/config/configProvider.go
++++ b/config/configProvider.go
+@@ -57,6 +57,7 @@ func SetBaseTestDefaults(cfg Provider) Provider {
+ setIfNotSet(cfg, "publishDir", "public")
+ setIfNotSet(cfg, "workingDir", "")
+ setIfNotSet(cfg, "defaultContentLanguage", "en")
++ setIfNotSet(cfg, "timeout", "2m")
+ return cfg
+ }
+
+--
+2.35.1
+
diff --git a/www-apps/hugo/hugo-0.98.0.ebuild b/www-apps/hugo/hugo-0.101.0.ebuild
index 455ae3474bd6..5da974c57af6 100644
--- a/www-apps/hugo/hugo-0.98.0.ebuild
+++ b/www-apps/hugo/hugo-0.101.0.ebuild
@@ -13,19 +13,19 @@ SRC_URI="
"
# NOTE: To create the vendor tarball, run:
-# `go mod vendor && cd .. && tar -cJf ${P}-vendor.tar.xz ${P}/vendor`
+# `go mod vendor && cd .. && tar -caf ${P}-vendor.tar.xz ${P}/vendor`
LICENSE="Apache-2.0 BSD BSD-2 MIT Unlicense"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="doc +sass test test-full"
+IUSE="doc +sass test"
BDEPEND="
>=dev-lang/go-1.18
test? (
dev-python/docutils
dev-ruby/asciidoctor
- test-full? ( app-text/pandoc )
+ virtual/pandoc
)
"
RDEPEND="
@@ -39,6 +39,7 @@ RESTRICT="!test? ( test )"
PATCHES=(
"${FILESDIR}/${PN}-0.96.0-unbundle-libwebp-and-libsass.patch"
"${FILESDIR}/${PN}-0.96.0-skip-some-tests.patch"
+ "${FILESDIR}/${PN}-0.99.1-test-timeout.patch"
)
src_configure() {
diff --git a/www-apps/hugo/hugo-0.93.3.ebuild b/www-apps/hugo/hugo-0.93.3.ebuild
deleted file mode 100644
index 7dd2072578ca..000000000000
--- a/www-apps/hugo/hugo-0.93.3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module bash-completion-r1
-
-DESCRIPTION="Fast static HTML and CSS website generator"
-HOMEPAGE="https://gohugo.io https://github.com/gohugoio/hugo"
-SRC_URI="
- https://github.com/gohugoio/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
- https://tastytea.de/files/${P}-vendor.tar.xz
-"
-
-# NOTE: To create the vendor tarball, run:
-# `go mod vendor && cd .. && tar -cJf ${P}-vendor.tar.xz ${P}/vendor`
-
-LICENSE="Apache-2.0 BSD BSD-2 MIT Unlicense"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc +sass"
-
-BDEPEND=">=dev-lang/go-1.16.0"
-RDEPEND="
- media-libs/libwebp
- sass? ( dev-libs/libsass )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-0.92.2-link-to-webp-and-sass.patch" )
-
-src_configure() {
- export CGO_ENABLED=1
- export CGO_CFLAGS="${CFLAGS}"
- export CGO_CPPFLAGS="${CPPFLAGS} -DLIBWEBP_NO_SRC -DUSE_LIBSASS_SRC"
- export CGO_CXXFLAGS="${CXXFLAGS}"
- export CGO_LDFLAGS="${LDFLAGS}"
-
- default
-}
-
-src_compile() {
- mkdir -pv bin || die
- local my_import_path="github.com/gohugoio/hugo/common"
- local mybuildtags="-tags $(usev sass "extended,")nodeploy"
- ego build -ldflags \
- "-X ${my_import_path}/hugo.buildDate=$(date --iso-8601=seconds) -X ${my_import_path}/hugo.vendorInfo=Gentoo" \
- ${mybuildtags} -o "${S}/bin/hugo"
-
- bin/hugo gen man --dir man || die
-
- mkdir -pv completions || die
- bin/hugo completion bash > completions/hugo || die
- bin/hugo completion fish > completions/hugo.fish || die
- bin/hugo completion zsh > completions/_hugo || die
-
- if use doc ; then
- bin/hugo gen doc --dir doc || die
- fi
-}
-
-src_install() {
- dobin bin/*
- doman man/*
-
- dobashcomp completions/${PN}
-
- insinto /usr/share/fish/vendor_completions.d
- doins completions/${PN}.fish
-
- insinto /usr/share/zsh/site-functions
- doins completions/_${PN}
-
- if use doc ; then
- dodoc -r doc/*
- fi
-}
diff --git a/www-apps/hugo/hugo-0.96.0.ebuild b/www-apps/hugo/hugo-0.99.1.ebuild
index 50ae5b3634cf..16dbceafb579 100644
--- a/www-apps/hugo/hugo-0.96.0.ebuild
+++ b/www-apps/hugo/hugo-0.99.1.ebuild
@@ -9,23 +9,23 @@ DESCRIPTION="Fast static HTML and CSS website generator"
HOMEPAGE="https://gohugo.io https://github.com/gohugoio/hugo"
SRC_URI="
https://github.com/gohugoio/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
- https://tastytea.de/files/${P}-vendor.tar.xz
+ https://tastytea.de/files/gentoo/${P}-vendor.tar.xz
"
# NOTE: To create the vendor tarball, run:
-# `go mod vendor && cd .. && tar -cJf ${P}-vendor.tar.xz ${P}/vendor`
+# `go mod vendor && cd .. && tar -caf ${P}-vendor.tar.xz ${P}/vendor`
LICENSE="Apache-2.0 BSD BSD-2 MIT Unlicense"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="doc +sass test test-full"
+IUSE="doc +sass test"
BDEPEND="
>=dev-lang/go-1.18
test? (
dev-python/docutils
dev-ruby/asciidoctor
- test-full? ( app-text/pandoc )
+ virtual/pandoc
)
"
RDEPEND="
@@ -39,6 +39,8 @@ RESTRICT="!test? ( test )"
PATCHES=(
"${FILESDIR}/${PN}-0.96.0-unbundle-libwebp-and-libsass.patch"
"${FILESDIR}/${PN}-0.96.0-skip-some-tests.patch"
+ "${FILESDIR}/${PN}-0.99.1-fix-testdecodeconfig-basic.patch"
+ "${FILESDIR}/${PN}-0.99.1-test-timeout.patch"
)
src_configure() {
diff --git a/www-apps/hugo/metadata.xml b/www-apps/hugo/metadata.xml
index c1a8bfb7f195..d3bce6b51931 100644
--- a/www-apps/hugo/metadata.xml
+++ b/www-apps/hugo/metadata.xml
@@ -11,7 +11,6 @@
</maintainer>
<use>
<flag name="sass">Enable SASS/SCSS support</flag>
- <flag name="test-full">Pull optional heavier test-dependency packages</flag>
</use>
<upstream>
<remote-id type="github">gohugoio/hugo</remote-id>
diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index f5b356cca677..96fbf9bec943 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,6 +1,6 @@
-DIST icingaweb2-2.10.0.tar.gz 11491028 BLAKE2B bee48e59ec7d0a564e7056986a84fda9639e61ed82ea65d35da310916e7058837fc146ee06f2c044748f72424198dc42f75b32de4b6ab39f673e2a9bbaf46966 SHA512 e26a4382970ece503c18ac9f93bb9e7ac24fd827dd84fd04352aeeff796ab58dac747840c6153cea5711d548603f219ba32aeffe76d87359ea72f2d3a598468b
DIST icingaweb2-2.10.1.tar.gz 11490414 BLAKE2B 897d5dcb4774db42651b53937f2bf80810b9a8d3eccb10bb733ce7b083e4eeea5673ee7cab75d24602871b72d44d84f7c1a6faec28c1ff4d2bd404a7d39d7ba2 SHA512 ba77ddeb27fb0ab1c6f7a77020eb9490803e1bf2d37186c7efc06bd250301a7d50f669699196d3a3208da9d5606edc787f62f34cdd15343e2c55020b77e485d8
-EBUILD icingaweb2-2.10.0.ebuild 2529 BLAKE2B 0bff09ed4258d2674a3e1ec780e6b7aa0d87cbcba5771af2ea2aae5fc10381f73f9b9434f09e3730c07d3ddcfdd2809f5b33273dd169f0c7ce808694d772c2ad SHA512 b9a0b279ac1606370ce0b238638c9a328990ffa977a50a21c61ad25b46d800e689b18c5eb8989e83a94a75a0d5afff3548989565a62bb3b6ab1551a8b17c2171
+DIST icingaweb2-2.10.2.tar.gz 11489780 BLAKE2B 4135e798afba7e7ea457ac00add5cd4ff14d9572ce6ffa50c8dc29ba43435e9305b9c2f52187bc50fc25f3def730c01c682a9ef80afdc79676a5d0c27dd87297 SHA512 e0e7f4f24c5609ccc0b1b0773fc018632bdd8d879311968e7b72cca1a856f227af3e6ff3e916b8bcdfc8c24c60d32008c6fee53ebac8d3a08328ded88baa3c00
EBUILD icingaweb2-2.10.1.ebuild 2529 BLAKE2B 0bff09ed4258d2674a3e1ec780e6b7aa0d87cbcba5771af2ea2aae5fc10381f73f9b9434f09e3730c07d3ddcfdd2809f5b33273dd169f0c7ce808694d772c2ad SHA512 b9a0b279ac1606370ce0b238638c9a328990ffa977a50a21c61ad25b46d800e689b18c5eb8989e83a94a75a0d5afff3548989565a62bb3b6ab1551a8b17c2171
+EBUILD icingaweb2-2.10.2.ebuild 2531 BLAKE2B 53f83accfd9a604c1c9ca85371379b8d6fda8df18dc0d0459a93549d3504fdd37cba3ca23deaeb7e28165fa56974d126bcc227a4f7459c4b92d885b4d2432dd1 SHA512 7fe3b7cb49979ce01fb96be9d7a887c2c540b521aac120cbc3437e371dedad178d8a9874574885845dce17642aedc1f9a7799164e5495c92aad7e5f29b6a7711
EBUILD icingaweb2-9999.ebuild 2531 BLAKE2B 3f5f8503d3157d485a7d20ee78f92d6cd1fb8948a7ae314a796e79c0379ab9b96fb7f57589fac9ad653cfad6eae4dfa04b67ec1064cad3e9bdd5915c8bebaaeb SHA512 564852d6c04c14e98870a205a72c1ab5d2c4e712b9a71bd84112fce7d44d5652835213375ef7e684dc752be05869cd91f6f3d32168bcdbf2c37c2b44ccbcdda8
MISC metadata.xml 444 BLAKE2B bf24467286f442770ed78cb298cd0fc1d37786b06e85bbc4b20a8c750764e7a831828ebc9b7872772f0a286b12cb67491cb1f84f189cf00e2ec59a6b921e760f SHA512 55e57997695e09ad9cc8448030e8470a0e39a1cbc610f70e29c2a68a4f287e54cb816b0cd1ceec611112849ba97225a60560b67368fb3a6ed68a73a728d61d83
diff --git a/www-apps/icingaweb2/icingaweb2-2.10.0.ebuild b/www-apps/icingaweb2/icingaweb2-2.10.2.ebuild
index eb5a96a535d5..1c12f98d4b39 100644
--- a/www-apps/icingaweb2/icingaweb2-2.10.0.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.10.2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]];then
EGIT_BRANCH="master"
else
SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
- KEYWORDS="amd64 x86"
+ KEYWORDS="~amd64 ~x86"
fi
LICENSE="GPL-2"
diff --git a/www-apps/ikiwiki/Manifest b/www-apps/ikiwiki/Manifest
index 318a95cde552..517331dc8e8f 100644
--- a/www-apps/ikiwiki/Manifest
+++ b/www-apps/ikiwiki/Manifest
@@ -1,3 +1,5 @@
DIST ikiwiki_3.20190228.orig.tar.xz 2672244 BLAKE2B 43012fc14f08c491ebe382e20953b8b01e10c390c28da0184b4e45a1435ada00b1ad6ac61f28c56ba1edb2e22dca1ab1f32eb77fc8d6133b899a26023593d3bd SHA512 125147d83dae6166b45541ed9176398ba4bd22ef3389d3efb3f442e558e326e0b004583d29aa32ed4bfca489c9d55b4232f074aab5fa649e51d9edd103685172
+DIST ikiwiki_3.20200202.3.orig.tar.xz 2689636 BLAKE2B 2b88691591e72dc7d55ace2860ce6faf0bd62fde119bbab9c8db7d55dda384b84a51b562aeb9397457fcfb8cd405cd327380e418f8a65debf1e311942c05c222 SHA512 a1d89ccc0d02cddb3ef53c4c4a4a3349139d558fd4eb418263551a48cb635ed29ef430f8276ef6b42486a9232706908752e15e88590e919db6665e1a8844a4e5
EBUILD ikiwiki-3.20190228-r1.ebuild 2112 BLAKE2B 12285fd264ef5aaef19abf81a71873a9a2005d597e283748d8474cf3fdce0d47c83cba8ab7ebc6323182e32c9e7fad7224fc6b3de0b378416378d3e4a24fff25 SHA512 4d8b3d16070252ea41dbc33be2751a837d7e999188d335c75139ad1de12afc4c467ad8de8ecfa7bcd3b6efac23c6c379d359a700f1cef22d818c86b3063ef0e2
+EBUILD ikiwiki-3.20200202.3.ebuild 2118 BLAKE2B e32c348454410319aa9400fa92b70c8387a310d010711933246d8609aee3ae9e92c6ec8ee835be4986136fd75d551bbaab948f31c634188e7fd8351c681643cf SHA512 794398a069c4a4585ecf7352175bd995769a3a0508fe6964d18977d11b5c19fa151fa0f29593b918a196ad7126b874439749678737eca0f80df1ec89fdb987e0
MISC metadata.xml 260 BLAKE2B 912094efbdb14e53fb606a8d85604fe8963d5c40162db26cbb43b8d18091d28a0d543d64edc7e300755b10e0fdada949901ca5df997a90ffe5be7f4717507855 SHA512 7ad3a45f173d9755b2b0faa91a3f35d110fae001d94f21b3e403a4933e14d385f2e8b1db9ad30dae6a5b282ca1b82028cebd3605ca3ab5cb4a06cf8059512cc8
diff --git a/www-apps/ikiwiki/ikiwiki-3.20200202.3.ebuild b/www-apps/ikiwiki/ikiwiki-3.20200202.3.ebuild
new file mode 100644
index 000000000000..d67f27418da5
--- /dev/null
+++ b/www-apps/ikiwiki/ikiwiki-3.20200202.3.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit perl-module
+
+DESCRIPTION="A wiki compiler"
+HOMEPAGE="http://ikiwiki.info/"
+SRC_URI="mirror://debian/pool/main/i/ikiwiki/${PN}_${PV}.orig.tar.xz"
+S="${WORKDIR}/ikiwiki-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="extras minimal test"
+RESTRICT="!test? ( test )"
+
+#Authen::Passphrase
+#Search::Xapian
+#Locale::gettext
+#Crypt::SSLeay
+#Text::CSV
+#Text::Typography
+#Text::Textile
+#Text::WikiFormat
+#Net::Amazon::S3
+
+EXTRA_RDEPEND="
+ dev-python/docutils
+ dev-perl/Digest-SHA1
+ dev-perl/File-MimeInfo
+ dev-perl/RPC-XML
+ dev-perl/XML-Feed
+ dev-perl/LWPx-ParanoidAgent
+ dev-perl/Net-OpenID-Consumer
+"
+
+SUGGESTED_RDEPEND="
+ dev-perl/CGI
+ >=dev-perl/CGI-FormBuilder-3.0202
+ >=dev-perl/CGI-Session-4.14
+ dev-perl/Mail-Sendmail
+ dev-perl/Term-ReadLine-Gnu
+ dev-perl/XML-Simple
+ media-gfx/imagemagick[perl]
+"
+
+TEST_DEPEND="
+ dev-perl/File-chdir
+ dev-perl/File-ReadBackwards
+ dev-perl/File-MimeInfo
+ dev-perl/HTML-LinkExtractor
+ dev-perl/HTML-Tree
+ dev-perl/Net-OpenID-Consumer
+ dev-perl/RPC-XML
+ dev-perl/XML-Feed
+ dev-perl/XML-Twig
+ dev-vcs/cvs[server]
+ dev-vcs/cvsps"
+
+DEPEND="
+ >=dev-lang/perl-5.10
+ app-text/po4a
+ dev-perl/HTML-Parser
+ dev-perl/HTML-Scrubber
+ dev-perl/HTML-Template
+ dev-perl/URI
+ dev-perl/Text-Markdown
+ dev-perl/TimeDate
+ dev-perl/YAML-LibYAML
+"
+
+RDEPEND="${DEPEND}
+ !minimal? (
+ ${SUGGESTED_RDEPEND}
+ extras? (
+ ${EXTRA_RDEPEND}
+ )
+ )
+"
+
+BDEPEND="test? ( ${TEST_DEPEND} )"
+
+SRC_TEST=do
+
+src_prepare() {
+ default
+
+ #bug 498444 /usr/lib/plan9/lib/fortunes.index
+ addpredict "/usr/lib/plan9/lib/fortunes"
+
+ sed -i 's,lib/ikiwiki,libexec/ikiwiki,' \
+ "${S}"/{IkiWiki.pm,Makefile.PL,doc/plugins/install.mdwn} || die
+# if use w3m ; then
+ sed -i 's,lib/w3m,libexec/w3m,' "${S}"/Makefile.PL || die
+# else
+# sed -i '/w3m/d' "${S}"/Makefile.PL || die
+# fi
+}
+
+src_install() {
+ emake DESTDIR="${D}" pure_install
+ insinto /etc/ikiwiki
+ doins wikilist
+
+ #dodoc -r doc/examples
+ #docompress -x /usr/share/doc/${PF}/examples
+ dodoc -r html/.
+ dodoc CHANGELOG
+ dodoc debian/NEWS
+}
diff --git a/www-apps/jekyll-coffeescript/Manifest b/www-apps/jekyll-coffeescript/Manifest
index e2b28b779e66..8e688d144cff 100644
--- a/www-apps/jekyll-coffeescript/Manifest
+++ b/www-apps/jekyll-coffeescript/Manifest
@@ -1,3 +1,3 @@
DIST jekyll-coffeescript-2.0.0.tar.gz 5984 BLAKE2B 2158f138820253a4e181035dcdf7e25ac7ded26ce7b6e6d6fb5f73e18f5c7e8bbeed8b47a8b12c059b2e7e5167e41f0f9645d5d08e85ff8ab52d400b1c4eb3c7 SHA512 31742ff4a9139d56baaa657b8259c1327a3f7ea14465203907b4d98e6c2b70286f5a1a7515140638a2347db86a35645e715a527b4b85fd536176277f7cfa3400
-EBUILD jekyll-coffeescript-2.0.0.ebuild 983 BLAKE2B b77b8db45cb5e13fe18a15718e5c1f8fe6f6f063057b140c53989276da4bb20107b52a05852fce612442463f5483961800c34ecd4606d2f56b105ddb08f6766d SHA512 c533d2b279badddc9b1ff5fa54253ab889e65064290172f932e3c44166bfb0dd5be4af38b7563b6a5967497d9c01903783db1d6d44adecfddb17467663945ca9
+EBUILD jekyll-coffeescript-2.0.0.ebuild 983 BLAKE2B 39c6a412f4f4bfd258c1f4d92756f9ec50e3b0a08a2d7acfdb70edf502b85e82b5602dec876a18b1f2a494c4c2a97c56606737367ceea7c5965019e7a4ccf670 SHA512 868977b0302b53d5ec5e87d008705beb40d64285e0930538246d70d1d78f628951213ae9e9be7985850a98efe21db9e545ffb5b1473d5120711ed9a2577e4851
MISC metadata.xml 257 BLAKE2B 4925a56d0e45b1d6dcae7f2bb3379f572d89e7a0c210954985c25364770190be5f8024aafd9fc387c8d59fa9657eb9c7872fefe13a29fb904a5e37e613bb21b0 SHA512 5077a3754a874894def1703d9caf781d22d828cc52930bc1d8e68e80079c9c0bda64f566f4486434e45bb9f2f7c8f7769ee06522337384d527960c258acf4747
diff --git a/www-apps/jekyll-coffeescript/jekyll-coffeescript-2.0.0.ebuild b/www-apps/jekyll-coffeescript/jekyll-coffeescript-2.0.0.ebuild
index 72f03cd668f7..b194dcd4b428 100644
--- a/www-apps/jekyll-coffeescript/jekyll-coffeescript-2.0.0.ebuild
+++ b/www-apps/jekyll-coffeescript/jekyll-coffeescript-2.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-USE_RUBY="ruby25 ruby26"
+USE_RUBY="ruby26 ruby27"
RUBY_FAKEGEM_RECIPE_TEST="rspec3"
RUBY_FAKEGEM_EXTRADOC="README.md History.markdown"
diff --git a/www-apps/jekyll-sass-converter/Manifest b/www-apps/jekyll-sass-converter/Manifest
index 5692836bd430..5054fcd4a083 100644
--- a/www-apps/jekyll-sass-converter/Manifest
+++ b/www-apps/jekyll-sass-converter/Manifest
@@ -1,3 +1,3 @@
-DIST jekyll-sass-converter-2.1.0.tar.gz 13136 BLAKE2B 9a0a477004a1967a51f894f9bdb99f5c311cbfedfa2b1f0ba1aa7756c8550099361d24347bd3ba8d61fdc5c6c0058cc06be0c87145bb52e67fb65348112f5937 SHA512 336420ee5cf099af94c6f6d9a1cf5bae971f4720f625040f722f502acf05b94e17fdfaac4ccab8b1e58768b653df6c4640dfc835a6425a56a41ddfe709e7009d
-EBUILD jekyll-sass-converter-2.1.0.ebuild 957 BLAKE2B 6e1c54410613ce1f60a95b7293470a78886090fb107a4af20399c05c54fdcea6c0343de5204d47290fb08684aaff3d08efa1a0ebf9cec4de7996136ea28a0a37 SHA512 8452ee610271de42ee0e35370b0ea531b999a78d74a9c64ede02e00d8c610a4aa71cc3d08519f4effe82e8c28031a9932c54883186ac2d9be61660ab89ba33df
+DIST jekyll-sass-converter-2.2.0.tar.gz 16359 BLAKE2B ed242d053c0c474bee9b86ca4987cb1348b3596c4c41415c229b454bc4aabf46c25c19ed69c4a206298bccde012935f10ec292d421c6506f22fa19fdd943d1ee SHA512 2704defb5ded854afb3620e876045e222e3f4bf03344f9a060fcfc0b1f2e6bebfef776aff69e592ba8484516060d4c5a75499fc343fcab5f9c96cc2f6658f344
+EBUILD jekyll-sass-converter-2.2.0.ebuild 992 BLAKE2B 8a1d2700f651118a1fabc12e429512ed48216f5d1ab2795788da65b7a76041bffe76af28bb334bab57c05c39363e1d6b0a92d0109177a67c5e105444c7dd18f9 SHA512 5abdde793ec532f7b2e3b6a85a3cbdf2233e2e97047c9d788648187f1c599d3677a77532ee556088bb2b985e9c3fd013a437ee78773669b4ebf351002256ad30
MISC metadata.xml 259 BLAKE2B dd88b002ec211fc2193ad1509236ed2b3d6a18dcd3000d0bae0790205d8163e0beb674f8970b1457c118fe31a87fc2be6b62b9bbab1f11ec0be597fe85b4ad53 SHA512 d4f90a12f7955e8550a0e3cf70bc33412496c0c2d5a39e562934e075607fd3778703a68ead652c4a3e9fb07e3338538df7988be48484f69fa81640f59f65922c
diff --git a/www-apps/jekyll-sass-converter/jekyll-sass-converter-2.1.0.ebuild b/www-apps/jekyll-sass-converter/jekyll-sass-converter-2.2.0.ebuild
index cf125868b075..220685d20eb3 100644
--- a/www-apps/jekyll-sass-converter/jekyll-sass-converter-2.1.0.ebuild
+++ b/www-apps/jekyll-sass-converter/jekyll-sass-converter-2.2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-USE_RUBY="ruby25 ruby26"
+EAPI=8
+USE_RUBY="ruby26 ruby27"
RUBY_FAKEGEM_RECIPE_TEST="rspec3"
RUBY_FAKEGEM_EXTRADOC="README.md History.markdown"
@@ -24,7 +24,9 @@ ruby_add_rdepend ">=dev-ruby/sassc-2.0.1:2"
ruby_add_bdepend "test? ( >=www-apps/jekyll-2 )"
all_ruby_prepare() {
- sed -i -e 's/git ls-files -z/find -type f -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+ sed -e 's/git ls-files -z/find * -type f -print0/' \
+ -e 's:_relative ": "./:' \
+ -i ${RUBY_FAKEGEM_GEMSPEC} || die
sed -i -e "1irequire 'tmpdir'" spec/scss_converter_spec.rb || die
# Avoid specs that require the minima theme
diff --git a/www-apps/jekyll-sitemap/Manifest b/www-apps/jekyll-sitemap/Manifest
index 2e446fe3c78c..5853bcf1834d 100644
--- a/www-apps/jekyll-sitemap/Manifest
+++ b/www-apps/jekyll-sitemap/Manifest
@@ -1,3 +1,3 @@
DIST jekyll-sitemap-1.4.0.tar.gz 68362 BLAKE2B df3b55198b5f5f7f26f76c0f164ecbfb11a5d0dd8c5f8fd191cdf2fa090585b7f5c072460b1f78fc0e4cf058366a05a249975f2c72424f2fb8cb5c94ec1e72c4 SHA512 1c2f1bfb72576b45a26be657b39ac18c13da33fbdf69dbf0dbb58cae96c826a838ea5145f2f664796b15cfe098ac7f2ddc21d8145ee105b2dd17a14af076151b
-EBUILD jekyll-sitemap-1.4.0.ebuild 694 BLAKE2B 4f9a3d988a9bec0fe22db09e9090e679d770eb95cbdcd11bdd5cb1fc3af70959704ebbcbe45d5aa2ee50cef3b185c0cf3e20a90547a29274d909116a3192abd6 SHA512 db9e84b7ed82af8382df71ad68bd5f6dc64d2d52abfcc55e8e415d6059d8cb1c547d2c8c3cc98b77c4cc5167549e22fb47b1a2f71f35e26bc7cab508524df4d1
+EBUILD jekyll-sitemap-1.4.0.ebuild 694 BLAKE2B 842462c4714e70f715dc2e214d009b329b8c3820ecf82e26e29c80fae695a07359a97f927e8c739a1fd981b2bb35732cd75c7b6b5718f731962eff19f92ce2c7 SHA512 4cfbb090cee81500f6a6e1b5cbd32d269f52a22670add7b4e52926f245baa819ba4ce30564466005aecdc70090bfa58b6c54e3f8bee0817125d0a7782856b741
MISC metadata.xml 254 BLAKE2B bf7609b1e1f2bb4f7ebacab4d8fec5402745d192c1e8a55b12527958de700e53f6ec4400a3af6ea95a9a6fb1e11fad5b3c65cde94af1af8344c1d99a295ec071 SHA512 7be1610c4049a859a468c8d90e665de1b5315b71017e95f8a776722020f92982385635abb75645e389f0b1a21a327804830794becd1d7cb230deab4d1b39a4e3
diff --git a/www-apps/jekyll-sitemap/jekyll-sitemap-1.4.0.ebuild b/www-apps/jekyll-sitemap/jekyll-sitemap-1.4.0.ebuild
index 6db4ff79ac9b..9b6ff7af26f8 100644
--- a/www-apps/jekyll-sitemap/jekyll-sitemap-1.4.0.ebuild
+++ b/www-apps/jekyll-sitemap/jekyll-sitemap-1.4.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-USE_RUBY="ruby25 ruby26"
+USE_RUBY="ruby26 ruby27"
RUBY_FAKEGEM_RECIPE_TEST="rspec3"
RUBY_FAKEGEM_EXTRADOC="README.md History.markdown"
diff --git a/www-apps/jekyll-watch/Manifest b/www-apps/jekyll-watch/Manifest
index db22138aa423..722966aa909a 100644
--- a/www-apps/jekyll-watch/Manifest
+++ b/www-apps/jekyll-watch/Manifest
@@ -1,3 +1,3 @@
DIST jekyll-watch-2.2.1.tar.gz 16631 BLAKE2B 2311802227206b76d1f7b18ccc6360514164c6148f549490bd4df69e56e4d7a8c944c828e950bb156929081ea8ac15bdc37099eba5af3e0f3e1c20b403828f60 SHA512 55867bedf0f453aad7df267d21cc2a49857916b51ed70e727718c9ed18dedd474bc45c446abcbc803ab4b8b26f8afb1f0e05e6655441186788fbace869c74b6d
-EBUILD jekyll-watch-2.2.1-r1.ebuild 793 BLAKE2B a90e5c7f30cc833b015eb111022ab3967d99108b2b89cde037aedb61c14a0c040186cd87833db8faf5a3dee1fc133ee9c5339d1c3d3b187a9905d36acf929cd1 SHA512 d609c22f0593e0b5e34c26829b7b2b81a2ef3cabf8f9109f8df61fab28a0961089d27dca6307b14e492d6025a0a0512627fff4f60798fd02ede60680fcd0aea3
+EBUILD jekyll-watch-2.2.1-r1.ebuild 793 BLAKE2B 44a577d7a8513dc92370a20f10128be820738d382c44b6a64054fdfd0e75975e1e033779af3c1e3d72108dc032bf5def9909c95e57b6ecc2dbbee53f61f537b7 SHA512 1bb308900d7397435c0d1fba1829ca83aebb28ae8a2af013de4f231733e35c68aac04c244e27a81fe3b26b7cfd3b7ad9b90ce889e5a481bb490b7d4f36f0e198
MISC metadata.xml 328 BLAKE2B 35074c34ff5eba041a9c192de3e3727e49c33bf41e16460d12074e9e565beb059665a536e99d875d63699ca8ea343aae60651249c592d9fad92e8475d1c29393 SHA512 5d54b72c5a6f7be7fb34405b99a25f4c7f52ab90ce57ac9e4c17c44719a0b3fa3f5925ece31752b6af54a1df275da4a6177fa04a96fbc29a6440e231dad734d5
diff --git a/www-apps/jekyll-watch/jekyll-watch-2.2.1-r1.ebuild b/www-apps/jekyll-watch/jekyll-watch-2.2.1-r1.ebuild
index ea15f9cf3f7b..421f141694fa 100644
--- a/www-apps/jekyll-watch/jekyll-watch-2.2.1-r1.ebuild
+++ b/www-apps/jekyll-watch/jekyll-watch-2.2.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-USE_RUBY="ruby25 ruby26"
+USE_RUBY="ruby26 ruby27"
RUBY_FAKEGEM_RECIPE_TEST="rspec3"
RUBY_FAKEGEM_TASK_DOC=""
diff --git a/www-apps/jekyll/Manifest b/www-apps/jekyll/Manifest
index 3fd2c2b722ff..87dba2befa51 100644
--- a/www-apps/jekyll/Manifest
+++ b/www-apps/jekyll/Manifest
@@ -1,7 +1,4 @@
AUX jekyll-3.6.0-test-helper.patch 657 BLAKE2B 8e9d9bb57efa2370976d459dac772f7f41c0bf02c2fc0c71f19d4b78714e06f96d8a800a45f7c3eca80f766639036a624df24e681a9258e4bdc76bfb563498ad SHA512 7b53cd03a988cc5c949d15be8de91ffd37d4f228822cc3bec64c961c163ba60946df1d314bdf746a33a42df091f06f481f945a712515cca04539e111393246d0
-DIST jekyll-4.1.1.tar.gz 1398438 BLAKE2B ac207d58b155e069fda40b4598d441d8fb88f22e85740082829d018dc9cefe51ca636b23a6207c37711c4d26e078f6e4913946599f0200b8e8cb065a9ceff952 SHA512 98c635b54219c9666de6496e76f3a131fc715d650d868049c0fe10d76851a027e0808609c2dce1a138c95eb2fb7e58ef978237a305484071339b4a15d5acc4d5
-DIST jekyll-4.2.0.tar.gz 1412419 BLAKE2B 351852b52abc227f8e1eedeeef0871a593d66ffc95f4ed644441f81e841582ab9f393b206f049107daa7e9deaa63d36359ff8d0b47c69b629dda2ea462cd0481 SHA512 aee4d832631a285c3d37576b5f3d80073b56afefcb8c8a19a74435ce431b606b5cedc28a02c8e3930f9bc35ab432c952f96e1878b3bee6b9d33fbd01f0a147ec
-EBUILD jekyll-4.1.1.ebuild 2478 BLAKE2B 7ebfa111013b93c0f930c1ee67a0a7b72b70e9c3084b6781dbb2192742720e3c5d408e7189489e51d3afbfd6f5d6e3df24fc09d979eb15f9a73713675c349ffc SHA512 20d1db68d598c41702f1dafb9c6ced88b93e0f4db63f67349a7e179b35fff6fe75c21caf8a8b566204d6d403c5a2f040d375c62358b5f125b258d1b14577120b
-EBUILD jekyll-4.2.0-r1.ebuild 2561 BLAKE2B a852d27dc158b9834820f5fc016054a09fc4251501608221f20cdc81e15618a094b1b1fa3faf2724335f1943411dff67d546b91cfba3286c062944e769dd0d78 SHA512 1d153c79191ac02f172474ea24a0f1d3a2afc88ae20ef02b4c8400d70f72020b604711460d4da20cee73fbf4ac1a8471200d88d679a8a7962601d25e86bda07e
-EBUILD jekyll-4.2.0.ebuild 2668 BLAKE2B 15d02fc712b298690f2422f274e68c0ac715a79384e03bc48fef0c21774c6f25d6c7e4972e42d95c2d15263c1d6d8f5a9d513f558edcb0e60416e3e5b1e798c0 SHA512 9145422d7e5e498d963618341951cdade141d79fff21c7307a175ef740346f80756906e1d8a4526aa892e8dd3b55d26cc7e6bdb6e33c5da52e4f440097d00b72
+DIST jekyll-4.2.2.tar.gz 1413485 BLAKE2B 08f4b8b72aecc19d5c8d7bd29897d88edb66ce82b172306ee4fe356a5d2598362f3946354eaa3701f14df0f97e7fc95361b5cc59ec8820703c879bcf05e6331a SHA512 3c72a24a2193493c9e417a05a113fa85889abd8df4d4c114fdc082e40de81d24824e3c4e41ecb3633ef780d4e3f3b0ab091c5f4234326a83b1a8a3da543275ff
+EBUILD jekyll-4.2.2.ebuild 2555 BLAKE2B f1e9c75954dbcb44206da685fff391b4354aee04447c5d4a900a8314a3bc55d98f6ac770e54368407b89a99f87e9455250c7c00c174dca230e7bfaed99da032a SHA512 35deb5e1c8ee963a635e5cc4c1841fb7011da5117ec5a2455aa4611065f1f0701166814d68e3649f5f7d758d7a8982093914040e0e977437248a5f8a67f42ab2
MISC metadata.xml 169 BLAKE2B 4307ce25f2199f9cb772e7740a911318479c0a7c122eb2c91e5c908e1e51bde7c261d0c9681dcb5095d0c8d9dc97c5ae40787c13ca971f705c5b471bbb1ce6b1 SHA512 9d7035f8acb273b0b044a4d8d04b395ddef6d5eb62333af0c232b7bdc112d90d5fd88913a60d4e0e1206d113d5cea77b5ece4defa421af52b2bcf3bf7e35d7f1
diff --git a/www-apps/jekyll/jekyll-4.1.1.ebuild b/www-apps/jekyll/jekyll-4.1.1.ebuild
deleted file mode 100644
index f6aebf2bdafd..000000000000
--- a/www-apps/jekyll/jekyll-4.1.1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26"
-
-inherit ruby-fakegem
-
-RUBY_FAKEGEM_EXTRADOC="README.markdown History.markdown"
-RUBY_FAKEGEM_EXTRAINSTALL="features"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-DESCRIPTION="A simple, blog aware, static site generator"
-HOMEPAGE="https://jekyllrb.com https://github.com/jekyll/jekyll"
-SRC_URI="https://github.com/jekyll/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="test"
-
-ruby_add_rdepend "
- >=dev-ruby/addressable-2.4
- >=dev-ruby/colorator-1.0
- >=dev-ruby/em-websocket-0.5
- dev-ruby/i18n:1
- >=dev-ruby/kramdown-2.1:2
- dev-ruby/kramdown-parser-gfm:1
- dev-ruby/liquid:4
- >=dev-ruby/mercenary-0.4.0
- >=dev-ruby/pathutil-0.9
- =dev-ruby/rouge-3*
- >=dev-ruby/safe_yaml-1.0
- >=dev-ruby/terminal-table-1.8:0
- >=www-apps/jekyll-sass-converter-2.0
- >=www-apps/jekyll-watch-2.0
-"
-
-ruby_add_bdepend "
- test? (
- >=dev-ruby/classifier-reborn-2.1.0
- dev-ruby/launchy
- >=dev-ruby/rdiscount-2.0
- >=dev-ruby/redcarpet-3.2.3
- dev-ruby/rspec-mocks
- >=dev-ruby/shoulda-3
- dev-ruby/test-unit:2
- www-apps/jekyll-coffeescript
- )
-"
-
-all_ruby_prepare() {
- eapply "${FILESDIR}"/jekyll-3.6.0-test-helper.patch
-
- # Drop tests requiring bundler
- sed -i -e '/bundle_message/d' test/test_new_command.rb || die
- rm test/test_plugin_manager.rb || die
-
- # Replace git command in gemspec
- sed -e 's/git ls-files/find -not -type d -print/' \
- -e 's:_relative ": "./:' \
- -i $RUBY_FAKEGEM_GEMSPEC || die
-
- # FIXMEs:
- # fails to find fixtures because this requires bundler
- rm test/test_theme.rb || die
- rm test/test_theme_assets_reader.rb || die
- sed -i -e '/^ should.*theme/,/^ end$/d' \
- -e '/^ should.*theme/,/^ end$/d' test/test_site.rb || die
- sed -i -e '/context "with a theme"/,/^ end/ s:^:#:' test/test_layout_reader.rb || die
- sed -i -e '/normalize paths of rendered items/askip "test-theme"' test/test_liquid_renderer.rb || die
- # partially requires 'toml'
- rm test/test_configuration.rb || die
- # pygments tests fail because of line numbering
- sed -i -e '/^ context.*pygments/,/^ end$/d' test/test_tags.rb || die
- #sed -i -e '/^ context.*pygments/,/^ end$/d' test/test_redcarpet.rb || die
-
- # Tries to use bundler and install packages.
- rm -f test/test_new_command.rb || die
-}
-
-src_test() {
- local -x JEKYLL_NO_BUNDLER_REQUIRE=true
-
- ruby-ng_src_test
-}
diff --git a/www-apps/jekyll/jekyll-4.2.0.ebuild b/www-apps/jekyll/jekyll-4.2.0.ebuild
deleted file mode 100644
index 8affdcb77943..000000000000
--- a/www-apps/jekyll/jekyll-4.2.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26"
-
-inherit ruby-fakegem
-
-RUBY_FAKEGEM_EXTRADOC="README.markdown History.markdown"
-RUBY_FAKEGEM_EXTRAINSTALL="features"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-DESCRIPTION="A simple, blog aware, static site generator"
-HOMEPAGE="https://jekyllrb.com https://github.com/jekyll/jekyll"
-SRC_URI="https://github.com/jekyll/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="test"
-
-ruby_add_rdepend "
- >=dev-ruby/addressable-2.4
- >=dev-ruby/colorator-1.0
- >=dev-ruby/em-websocket-0.5
- dev-ruby/i18n:1
- >=dev-ruby/kramdown-2.1:2
- dev-ruby/kramdown-parser-gfm:1
- dev-ruby/liquid:4
- >=dev-ruby/mercenary-0.4.0
- >=dev-ruby/pathutil-0.9
- =dev-ruby/rouge-3*
- >=dev-ruby/safe_yaml-1.0
- >=dev-ruby/terminal-table-1.8:0
- >=www-apps/jekyll-sass-converter-2.0
- >=www-apps/jekyll-watch-2.0
-"
-
-ruby_add_bdepend "
- test? (
- >=dev-ruby/classifier-reborn-2.1.0
- dev-ruby/httpclient
- dev-ruby/kramdown-syntax-coderay
- dev-ruby/launchy
- dev-ruby/nokogiri
- >=dev-ruby/rdiscount-2.0
- >=dev-ruby/redcarpet-3.2.3
- dev-ruby/rspec-mocks
- >=dev-ruby/shoulda-3
- dev-ruby/test-unit:2
- www-apps/jekyll-coffeescript
- )
-"
-
-all_ruby_prepare() {
- # reported upstream https://github.com/jekyll/jekyll/issues/8556
- eapply "${FILESDIR}"/jekyll-missingdep.patch
- eapply "${FILESDIR}"/jekyll-3.6.0-test-helper.patch
-
- # Drop tests requiring bundler
- sed -i -e '/bundle_message/d' test/test_new_command.rb || die
- rm test/test_plugin_manager.rb || die
-
- # Replace git command in gemspec
- sed -e 's/git ls-files/find -not -type d -print/' \
- -e 's:_relative ": "./:' \
- -i $RUBY_FAKEGEM_GEMSPEC || die
-
- # FIXMEs:
- # fails to find fixtures because this requires bundler
- rm test/test_theme.rb || die
- rm test/test_theme_assets_reader.rb || die
- sed -i -e '/^ should.*theme/,/^ end$/d' \
- -e '/^ should.*theme/,/^ end$/d' test/test_site.rb || die
- sed -i -e '/context "with a theme"/,/^ end/ s:^:#:' test/test_layout_reader.rb || die
- sed -i -e '/normalize paths of rendered items/askip "test-theme"' test/test_liquid_renderer.rb || die
- # partially requires 'toml'
- rm test/test_configuration.rb || die
- # pygments tests fail because of line numbering
- sed -i -e '/^ context.*pygments/,/^ end$/d' test/test_tags.rb || die
- #sed -i -e '/^ context.*pygments/,/^ end$/d' test/test_redcarpet.rb || die
-
- # Tries to use bundler and install packages.
- rm -f test/test_new_command.rb || die
-}
-
-src_test() {
- local -x JEKYLL_NO_BUNDLER_REQUIRE=true
-
- ruby-ng_src_test
-}
diff --git a/www-apps/jekyll/jekyll-4.2.0-r1.ebuild b/www-apps/jekyll/jekyll-4.2.2.ebuild
index 40520250a3c6..f7a34488c3e2 100644
--- a/www-apps/jekyll/jekyll-4.2.0-r1.ebuild
+++ b/www-apps/jekyll/jekyll-4.2.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-USE_RUBY="ruby25 ruby26"
+USE_RUBY="ruby26 ruby27"
inherit ruby-fakegem
@@ -28,14 +28,14 @@ ruby_add_rdepend "
>=dev-ruby/colorator-1.0
>=dev-ruby/em-websocket-0.5
dev-ruby/i18n:1
- >=dev-ruby/kramdown-2.1:2
+ >=dev-ruby/kramdown-2.3:2
dev-ruby/kramdown-parser-gfm:1
dev-ruby/liquid:4
>=dev-ruby/mercenary-0.4.0
>=dev-ruby/pathutil-0.9
=dev-ruby/rouge-3*
>=dev-ruby/safe_yaml-1.0
- >=dev-ruby/terminal-table-1.8:0
+ dev-ruby/terminal-table:2
>=www-apps/jekyll-sass-converter-2.0
>=www-apps/jekyll-watch-2.2.1-r1
"
diff --git a/www-apps/mediawiki/Manifest b/www-apps/mediawiki/Manifest
index 541d30c47289..c0ba6125f061 100644
--- a/www-apps/mediawiki/Manifest
+++ b/www-apps/mediawiki/Manifest
@@ -1,7 +1,7 @@
AUX postinstall-1.18-en.txt 2611 BLAKE2B c4d110d0d7c3fc270b0dc7f134cf7de8f2ca4595692ac146c2e4cd1c3647e7399d44249059496960ae94490c5b188c986dab64d4b90901bd7fc44203493532a0 SHA512 2b6a0e00160c15466bf70189499816d18a5ea06f040ed79f2361842be93a584ea19033170dc59c1d78c590da85223a61b8d04730084e60bc7906648f2532578b
AUX postupgrade-1.16-en.txt 1519 BLAKE2B 39cf00073c5d12e04dd69126c7671acb5876bcdd592526d6aca475b98f9ed7abcb6d2691cef8642be04d8041fcbdaee0555937f1480f71a82c3f367f2a3d99b6 SHA512 495a2ea3074e96e570ed83e557691786524aea878fa6ee489080245a9bb1669d93e318c3871ce44918225d0e64d09e1e644538627bfb35a4a2a12d27365dc89d
-DIST mediawiki-1.36.4.tar.gz 50642912 BLAKE2B da3a92d55d78f68be3e07d6d8442ff866ab4b839b7f8346737978c5d45686e325cb53f9217a3821f367e07fb67ab75659be87668107f7eeb14836316205afeda SHA512 428ea890a0dc39e0dc98706563abc761849375ad510f758e2541f40164254f5fdec85168e356aa7d55a16dc9e33f930fae9ee43b8b5a30cdc3f6dadb1dfe91b7
DIST mediawiki-1.37.2.tar.gz 51239351 BLAKE2B 01bebdba62e60d910ff046d39d4bc3a9c62fd71818bf766ed47332d843c54309e0e68d2948b1381a395c6e2fbd6c8e96cf04376e7108ea39445cc619cad21856 SHA512 a92cbdf7fd60e91d5690919c3ab301a32b4c9cb5681ba8b6ba74d21d22947aa2da894b1e4f3294684e40cfeb47a529bf1cb253692baa4f9251d47d7c98015844
-EBUILD mediawiki-1.36.4.ebuild 2567 BLAKE2B 2d6f901f541f1b864e90216a81b5ad1247690ff89853fdbcf8987e635d7db882e1e79326272800bd5ab014998466e0ded1fc4f17dbcd68b47f564761c00154db SHA512 e2b547f4998c4fcc448c7957c75b47089ddcf345d8d80160811351790354d8ea2857cecf549fb561e4c62f2a85aa90fe275fbedeb5690cbf885c920149fc1faf
+DIST mediawiki-1.38.1.tar.gz 54877814 BLAKE2B 792e22602a816a3f21e77268e38fab450c9ff89a4e490e9592536c2df9d54d7a8cb68a240cf26aeb6d50dd6a87beb7b4fb3cb9f5b88af8d7c16040dbf1cd80ff SHA512 895d21a5b249176099c8d7dee3c83e162b74305615cc8f60288c1d79dbde6f8976257440c109942780fc93dff0645ea1630830b6843eef2eb57d1bfc10e9b846
EBUILD mediawiki-1.37.2.ebuild 2567 BLAKE2B 2d6f901f541f1b864e90216a81b5ad1247690ff89853fdbcf8987e635d7db882e1e79326272800bd5ab014998466e0ded1fc4f17dbcd68b47f564761c00154db SHA512 e2b547f4998c4fcc448c7957c75b47089ddcf345d8d80160811351790354d8ea2857cecf549fb561e4c62f2a85aa90fe275fbedeb5690cbf885c920149fc1faf
+EBUILD mediawiki-1.38.1.ebuild 2579 BLAKE2B 72274264fd44c3acac46f9973c55eca89025801a213ed1d6fdddb1013743e5166d2ed9b2a060712db957c3af8c4c8cc38b186dc15f3e07bb9dd7cdffc522462f SHA512 ed761efecd0ef7ea32e54e2d40e6f6f9d106841adb0608265ba12c5572edce30125aa8d937262bee64d76af3bfd1109885664f8378832481ea0d686201ae074a
MISC metadata.xml 270 BLAKE2B 9041e12c102c98e539b1d69a8b47a683f7f2fd2e5c1d9b0d8ceb4af9b7abc98d56cd64f4ed335717cffe7acef253748f7798997b8edab1c73d4b4f8eb75528c5 SHA512 fbdd6fdd911b687eaa654d7a9cc25c469c68de3d582d29c142acb5f3944be4ca8205345b94841b831f1b25f604c97bdbeab2bc10bd1cc6a371f651297b56f692
diff --git a/www-apps/mediawiki/mediawiki-1.36.4.ebuild b/www-apps/mediawiki/mediawiki-1.38.1.ebuild
index 6d430cdf861e..bb79cc3c61e6 100644
--- a/www-apps/mediawiki/mediawiki-1.36.4.ebuild
+++ b/www-apps/mediawiki/mediawiki-1.38.1.ebuild
@@ -11,11 +11,11 @@ HOMEPAGE="http://www.mediawiki.org"
SRC_URI="http://releases.wikimedia.org/${PN}/${MY_BRANCH}/${P}.tar.gz"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ppc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86"
IUSE="imagemagick mysql postgres +sqlite"
REQUIRED_USE="|| ( mysql postgres sqlite )"
-RDEPEND=">=dev-lang/php-7.3.19[ctype,fileinfo,iconv,intl,json(+),postgres?,session,ssl,unicode,xml,xmlreader]
+RDEPEND=">=dev-lang/php-7.3.19[calendar,ctype,fileinfo,iconv,intl,json(+),postgres?,session,ssl,unicode,xml,xmlreader]
imagemagick? ( virtual/imagemagick-tools )
!imagemagick? ( dev-lang/php[gd] )
mysql? ( dev-lang/php[mysql,mysqli] )
diff --git a/www-apps/miniflux/Manifest b/www-apps/miniflux/Manifest
index b6f532decab7..558f4e7579c5 100644
--- a/www-apps/miniflux/Manifest
+++ b/www-apps/miniflux/Manifest
@@ -5,5 +5,8 @@ AUX miniflux.initd 504 BLAKE2B d43cc0323161fc3723063f07fb5d8da4f762b420dedbcab28
AUX miniflux.service 463 BLAKE2B e6f1a3717e985f3ddae4224472b753f293a73ab015acbe80ddf20d2d9e505aa9fd47e2fca2c86749067288a1f10787e16179a41e5c30d3f37f53e83f798719b8 SHA512 c38fe3f19162be02a44a353281690d40e90cb8ac8126ea4f9aab1218e128da0be3d1152cf260fdfd19ecfed2ea4396ae4a6c645088a1b212b58a3cba8387ce60
DIST miniflux-2.0.36-deps.tar.xz 151007452 BLAKE2B b21e2a96e9c19341ff1435deb41558b6a1061d7ed136f4164e577949519582e003bfc0ac7f1d60453dbde89d807fbf2707c878dc3c5e0da874ce8f3b6e6682d9 SHA512 f7708d45ad1ed72faf4a32420c990fdeea25258d7caa2a332781590b169bbaa4ead53baaf1024e2e399921182551876a63a3e516a94fdc074995b5cb1d35b9d1
DIST miniflux-2.0.36.tar.gz 548596 BLAKE2B b3f6a85d635eb095f41852d3e618e7e2e2b97e83c776f16b4da9a22a0bb03e9c1815c4ea1a9b841ee8132087067fb7e00a084536f99e004c0863adaf6bbc64b0 SHA512 0c3f1b68e1cb9c4cf5e543847abf3cb34bb56152991a3cd257f4886c7573d17fc177f928574040c2d5b339bf8fe39f9504952f234babe1dcd3b824f8ec95c75a
+DIST miniflux-2.0.37-deps.tar.xz 154048036 BLAKE2B 88eaba31505c4d1ace55428a8e29dac8449776e1f9cd9a9fe5a54f21dee65df8ddb9c8cfc88968ec4476cc5e3d7670f47ffc98d41ea5a6fe1ae9e23bb6b09807 SHA512 c499964a174a0cef1ec09824e8b6f9fbe3ff8eb77e2f5f9f4aedd73f95c569338afd4ec5c9c312556c9435863c8a4398b63a5f24a55c61d0d8a5afd63a83f31b
+DIST miniflux-2.0.37.tar.gz 555360 BLAKE2B 64188e03583dd011261c2d69c30e105af65d61ed996c4c2785621aa74d6b0602eaeed312750a089dfb1c4f5bc00c26f79549f2df27714cdca44506439b2ba6af SHA512 6944e638cdec6d0d5e92362ad4849028d0260780919eff8d6b6999327f9a482a1b3b09f1479b3c8c4b2727ced524caa13a6c7ac655b230ff244519cfe095cbd5
EBUILD miniflux-2.0.36.ebuild 2578 BLAKE2B 555cce45ceea4f96b75638128b60ee946532bb329f3bd4a6f93fffed8a28f8a8547331bd8c1cc73fb1bcca1234a5c8e71fce63e745294e6f9c55ad2fc6a964eb SHA512 1d5c77e1f8699ea710d38760d624f1bbd6286c4d42d1f827df516ac13a6d977ade246c0150e7de2f4509f5d31e706b6175e7b8df4b30175bf68b14f1c70c1ccd
+EBUILD miniflux-2.0.37.ebuild 2578 BLAKE2B 555cce45ceea4f96b75638128b60ee946532bb329f3bd4a6f93fffed8a28f8a8547331bd8c1cc73fb1bcca1234a5c8e71fce63e745294e6f9c55ad2fc6a964eb SHA512 1d5c77e1f8699ea710d38760d624f1bbd6286c4d42d1f827df516ac13a6d977ade246c0150e7de2f4509f5d31e706b6175e7b8df4b30175bf68b14f1c70c1ccd
MISC metadata.xml 329 BLAKE2B 50e914926db603f0d6e89f009847cab4ed7e771c33779da94e71d78dd4322457a19c8b1f4d9a27670fcde68ffd4480582c8def09973b84cc69bcf670fabfae19 SHA512 c00ceaf0e7d32f4395cdba01ce2af24ce7ab2d50baa250abe035f78d905b864fc1e0947226fce655adb5b0355030b30adabd6c64d306b83a5b8f6aae70dcdbcf
diff --git a/www-apps/miniflux/miniflux-2.0.37.ebuild b/www-apps/miniflux/miniflux-2.0.37.ebuild
new file mode 100644
index 000000000000..005822d6132c
--- /dev/null
+++ b/www-apps/miniflux/miniflux-2.0.37.ebuild
@@ -0,0 +1,98 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module systemd
+
+DESCRIPTION="Minimalist and opinionated feed reader"
+HOMEPAGE="https://miniflux.app https://github.com/miniflux/v2"
+SRC_URI="https://github.com/${PN}/v2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="test" # requires network access
+
+DEPEND="acct-user/miniflux"
+RDEPEND="${DEPEND}
+ >=dev-db/postgresql-9.5
+"
+
+S="${WORKDIR}/v2-${PV}"
+
+src_compile() {
+ ego build -ldflags="-s -w -X 'miniflux.app/version.Version=${PV}' " -o miniflux main.go
+}
+
+src_install() {
+ dobin miniflux
+
+ insinto /etc
+ doins "${FILESDIR}/${PN}.conf"
+
+ newconfd "${FILESDIR}/${PN}.confd" ${PN}
+
+ newinitd "${FILESDIR}/${PN}.initd" ${PN}
+ systemd_dounit "${FILESDIR}/${PN}.service"
+
+ fowners miniflux:root /etc/${PN}.conf
+ fperms o-rwx /etc/${PN}.conf
+
+ local DOCS=(
+ ChangeLog
+ README.md
+ "${FILESDIR}"/README.gentoo
+ )
+
+ # Makefile has no install target, so call einstalldocs directly
+ einstalldocs
+
+ doman "${PN}".1
+}
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ # This is a new installation
+
+ echo
+ elog "Before using miniflux, you must first create and initialize the database"
+ elog "and enable the hstore extension for it."
+ elog ""
+ elog "Afterwards, create your first admin user by running:"
+ elog " miniflux -create-admin"
+ else
+ # This is an existing installation
+
+ echo
+ elog "If you are upgrading from a previous version, schema migrations must be performed."
+ elog "To perform the migrations, stop the daemon, backup your database, and run:"
+ elog " emerge --config =${PF}"
+ fi
+
+ echo
+ elog "Please read"
+ elog ""
+ elog " ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
+ elog ""
+ elog "for more information."
+}
+
+pkg_config() {
+ # To be safe, avoid doing migrations if miniflux is running
+ if pgrep miniflux; then
+ die "miniflux appears to be running, refusing to continue."
+ fi
+
+ # Extract the database URL variable instead of just sourcing the config file
+ # because miniflux itself may interpret quotes as part of the URL
+ local DATABASE_URL="$(sed -n 's/^DATABASE_URL=\(.*\)/\1/p' ${EROOT}/etc/${PN}.conf)"
+ [[ -n "${DATABASE_URL}" ]] || die "Failed getting DATABASE_URL from config file"
+
+ DATABASE_URL="${DATABASE_URL}" "${EROOT}"/usr/bin/miniflux -migrate || die "miniflux -migrate failed. Please check the above output for errors."
+
+ echo
+ elog "Database migrations complete."
+}
diff --git a/www-apps/nanoc-checking/Manifest b/www-apps/nanoc-checking/Manifest
index 78554d1f222b..818e9949761f 100644
--- a/www-apps/nanoc-checking/Manifest
+++ b/www-apps/nanoc-checking/Manifest
@@ -1,5 +1,5 @@
DIST nanoc-checking-1.0.1.gem 10752 BLAKE2B 6f6f10cf97ab17cc328d827ab19490fa6e9d6f744594c167b4d9bf050c1288a7d5657d290402efbfa8d61d8e81550feae5022720464814e27af06d5025dfde96 SHA512 ef2b5a9c044f9bef19e4c75cc9ee99747a2ff0f8bece23c56d763f59c622488ccd980a19a3563207948fdb0d9edb91e86703778f7233bc0de76adf385c5694b0
DIST nanoc-checking-1.0.2.gem 11264 BLAKE2B 5ac338624bd85decb52ad4d59cff466ba849bd03c4b27534db34528db3fa768c1c198461bd35614203f352426105ea541c3dd0da2dff27a8430aa600a756f1fc SHA512 29fcd816f908bd7fdc2895e549d4cd0834ac53f8fc1bf8a9cf12e385cc9a1cabcca87178014beffe6b1b9f63b68d4bfe89096234ec72d3abc37dc8cc906eff24
EBUILD nanoc-checking-1.0.1.ebuild 589 BLAKE2B 87f1d0b73aeaf813b51eb42f2cf81ce9d53060af52eb729be73b75db8a29a603373f4a9aeab65309c6547b78ee6d5899ee108d4282f9d933cf4eee2bc4895a51 SHA512 d9f7b4cd2fd45c7b4b50fb2373afb625d0bb883bbbff88db5cb1ff742bbd37df0ac2c02cb6ba925a18ab8dbcbf8944d42525a208aba247131944e6d6d4b79893
-EBUILD nanoc-checking-1.0.2.ebuild 587 BLAKE2B a82ccafe5ba20782621f624c4f4b5fe517437f76153898c30660b35c1074863c75ac194cbe4c5dc83975d777c258b070afab12eca8f5e009f1d3a4ebd6cb2fa7 SHA512 32ed0c487f1559c84d4bc34257e775fd2afd8f497a49a9624ee1116069f97520cbed65c401dcc4c81ffa2989d8a50ba17d0fb2008b194d9a65e6a05bd8fa4e37
+EBUILD nanoc-checking-1.0.2.ebuild 594 BLAKE2B 4b2869a51d06a4156127ee494aa90d985ce238f83a48bedcae078ff962c4b7744f980a180b6c6e5f79380b3a6e79ad853159716bba68852e3925fd09955874da SHA512 572af1709b96d939f11172b0881e63cf8ff35c8da00685b5e2e8d0da924bbdfbc27fe0e183ffb5c66546c9db673d21e40f673fcd97a033f2d2ec1e21d2d6be39
MISC metadata.xml 318 BLAKE2B 62f33f86cd5bcb675e9ac02fef339514b88000be788a7037416bf6594e3f27bb07c5f7b49adbc39aa6aae4fdc7f076ebbb7f0fe897807a8e4a0b2252d5238546 SHA512 1098cd34add4d21c0c10aa42a539cec14c56b1835701b73346a57cac7ea3964b776b95d76cdffd6300577682e3a29976d9b65a0e2b8f984ee1bfb7601f2d7ef2
diff --git a/www-apps/nanoc-checking/nanoc-checking-1.0.2.ebuild b/www-apps/nanoc-checking/nanoc-checking-1.0.2.ebuild
index b82ea09aba08..125b020adb9f 100644
--- a/www-apps/nanoc-checking/nanoc-checking-1.0.2.ebuild
+++ b/www-apps/nanoc-checking/nanoc-checking-1.0.2.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
# Upstream has specs but they are not available in the gem and the
# repository upstream is not tagged for this.
diff --git a/www-apps/nanoc-cli/Manifest b/www-apps/nanoc-cli/Manifest
index 783701fa9a98..647852665b05 100644
--- a/www-apps/nanoc-cli/Manifest
+++ b/www-apps/nanoc-cli/Manifest
@@ -1,7 +1,9 @@
DIST nanoc-4.12.2.tar.gz 331400 BLAKE2B f7a22b05a4805f15a8e93601ae21bffdc19fe17c6550378465d85e63c498c5773c1dcd49d685b7d4367488300394c2f5bf9e6a6dc6aea589617a27fe1bd6ed4a SHA512 3fe574c061d8d0dd034137800c88a34844d246e6ab9a7816aadb03cd2c43b5fe6d614f42e6b41bcd4df98be551edc69e35ca992f2d5ee8158f9c7eb3c7635750
DIST nanoc-4.12.3.tar.gz 332692 BLAKE2B 8ae106366c66500ed06be841382bc1cc52c68ebc7ebec47a3f9dab278c7e17f886d0ce18c81ff73a83ec672353503155b447dfff5ba46f16bc2bfe891bb028a5 SHA512 737ce993c529643440d74e5072e2d63c2ce970d4d7637e7f225a79d3ac38907ced84928340d7bf5f11bcd02188b5cb1df0d4b03a8e000878ed924ab943db33a2
DIST nanoc-4.12.5.tar.gz 333312 BLAKE2B bdc50ba2868313f7b427a8292c8614230e9dcf472c5290e8fff39917cd5cedad217acbc36ef8524254c9839d965d824a98c99f9effa1e8cfb549e387d69f1032 SHA512 2e533076f62605a701275fd7813b6dbe09c2530ad38fb86db3a5d999bccd8f5ac93cf684ac882f00d81bbe1ec8cce69d45ecef1488efe3caf22f6a6ffca300e2
+DIST nanoc-4.12.6.tar.gz 333932 BLAKE2B f5ff12ddd583c4a672c34a63b7f325a3ef6c18713f4e351482eb3c2a3dd5999b67ee0e1b7e8ab85899591824d8c47f19f3aa074790ae15f4616d589f762f2bb8 SHA512 343ec620d96ca086612c4babcadf33c4edcc39a02082f762568feaf226566c6d9b5441f53355ea03544b285e9a5ddc32aae0e67cc321b28336665d453f47b070
EBUILD nanoc-cli-4.12.2.ebuild 2029 BLAKE2B fda269aacc8243a30aebe529c8b0d8cadb2db6f06408c47dd9cfe11714cbebf11ba83d646f5d4319776636add2c24dec403864ae4a49b990bc5a82aecd8b6d12 SHA512 ca60a110fa12c27a43ff232785db3a94c9121b6a86b5e6508f06ffcf3f96fffe8db077030b691e0e238099c838acbe1a049042b04ab97e5a81d98fbf2e6fc33c
EBUILD nanoc-cli-4.12.3.ebuild 2036 BLAKE2B e621d893406f3d5140b434e8a015117265352ead95b9f5659db812dd3e5342f36ab5c4579b828a716876e7dfd7f2ff3a992e6dc4e3d1d9e681bbff17c39c4f80 SHA512 32f48b02456d3b31c716ef2cd155cc8868c89cf3c64b204c19dd9549c0b15d083d234f7565c7985028a340ec9410a4d38bdada505440504b56c86a4a3369f252
EBUILD nanoc-cli-4.12.5.ebuild 2036 BLAKE2B e621d893406f3d5140b434e8a015117265352ead95b9f5659db812dd3e5342f36ab5c4579b828a716876e7dfd7f2ff3a992e6dc4e3d1d9e681bbff17c39c4f80 SHA512 32f48b02456d3b31c716ef2cd155cc8868c89cf3c64b204c19dd9549c0b15d083d234f7565c7985028a340ec9410a4d38bdada505440504b56c86a4a3369f252
+EBUILD nanoc-cli-4.12.6.ebuild 2043 BLAKE2B 1885ff99301bde74b7fc5c7819e59ab8fa584d7275e11f731029c603c9c795ba1175aa3ba353fa73960567331fd5e3ab81aae5faa9ded36c2a54a01b0ac31c67 SHA512 2406ffaaa872e8846f48720db03521132eb2f90892c1af67e5060dde5a5a6d59aec3c8cbfb360ba7b4e3439b1a60233d6e40feaca0bf288ed6f96f8eb8120890
MISC metadata.xml 318 BLAKE2B 62f33f86cd5bcb675e9ac02fef339514b88000be788a7037416bf6594e3f27bb07c5f7b49adbc39aa6aae4fdc7f076ebbb7f0fe897807a8e4a0b2252d5238546 SHA512 1098cd34add4d21c0c10aa42a539cec14c56b1835701b73346a57cac7ea3964b776b95d76cdffd6300577682e3a29976d9b65a0e2b8f984ee1bfb7601f2d7ef2
diff --git a/www-apps/nanoc-cli/nanoc-cli-4.12.6.ebuild b/www-apps/nanoc-cli/nanoc-cli-4.12.6.ebuild
new file mode 100644
index 000000000000..878387af78c7
--- /dev/null
+++ b/www-apps/nanoc-cli/nanoc-cli-4.12.6.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="nanoc is a simple but very flexible static site generator written in Ruby"
+HOMEPAGE="https://nanoc.ws/"
+SRC_URI="https://github.com/nanoc/nanoc/archive/${PV}.tar.gz -> nanoc-${PV}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~riscv"
+SLOT="0"
+IUSE="${IUSE} minimal"
+
+RUBY_S="nanoc-${PV}/nanoc-cli"
+
+ruby_add_rdepend "
+ >=dev-ruby/cri-2.15:0
+ >=dev-ruby/diff-lcs-1.3:0
+ ~www-apps/nanoc-core-${PV}
+ >=dev-ruby/zeitwerk-2.1:2
+"
+
+ruby_add_bdepend "test? (
+ dev-ruby/bundler
+ dev-ruby/rspec:3
+ dev-ruby/rspec-its
+ dev-ruby/fuubar
+ dev-ruby/minitest
+ dev-ruby/timecop
+ dev-ruby/tty-command
+ dev-ruby/yard
+ www-apps/nanoc-spec
+)
+"
+
+all_ruby_prepare() {
+ # Avoid unneeded development dependencies
+ sed -i -e '/simplecov/I s:^:#:' \
+ -e '/codecov/I s:^:#:' ../common/spec/spec_helper_head_core.rb || die
+ sed -i -e '/coverall/I s:^:#:' \
+ -e '/rubocop/ s:^:#:' Rakefile || die
+ sed -i -e '2i require "tmpdir"; require "pathname"' spec/spec_helper.rb || die
+
+ echo "-r ./spec/spec_helper.rb" > .rspec || die
+
+ sed -i -e "s:require_relative 'lib:require './lib:" ${RUBY_FAKEGEM_GEMSPEC} || die
+
+ # Avoid error handler specs failing due to different (rubygems?)
+ # output, meta_spec is affected by this.
+ rm -f spec/nanoc/cli/error_handler_spec.rb spec/meta_spec.rb || die
+
+ # Avoid test requiring a network interface
+ sed -i -e '/does not listen on non-local interfaces/askip "Needs network"' spec/nanoc/cli/commands/view_spec.rb || die
+
+ # Avoid tests requiring an additional dependency on nanoc-live
+ sed -i -e '/--live-reload is given/askip "Unpackaged nanoc-live"' spec/nanoc/cli/commands/view_spec.rb || die
+ sed -i -e '/watches with --watch/askip "Unpackaged nanoc-live"' spec/nanoc/cli/commands/compile_spec.rb || die
+}
+
+each_ruby_test() {
+ RUBYLIB="${S}/lib" ${RUBY} -S rake spec || die
+}
diff --git a/www-apps/nanoc-core/Manifest b/www-apps/nanoc-core/Manifest
index 216c26ddc3ac..6dc4fefb2fdf 100644
--- a/www-apps/nanoc-core/Manifest
+++ b/www-apps/nanoc-core/Manifest
@@ -1,10 +1,10 @@
AUX nanoc-core-4.12.2-contracts.patch 543 BLAKE2B 374bc86e4351627693d85517f24a82505454eb3eb52c6b12be1681e5bcc4f7a299b98ea72edca42a26e8d121219e6a76afe636b9b08da44e334c10f9fb5be47b SHA512 e8bfcfa6e49439734f6fe760dc46d5eaf6dee9d79a0be83e65dd450a769e0745422d76bf4067d475921b83a4534c9868aca9ef23f2a1fe6ff3ac7ba4b15fe3f6
-DIST nanoc-core-4.11.12.tar.gz 310160 BLAKE2B ef34bf6d28d5a9287053a939ef14bc59f99bde003d7bbcd7eee861ab882a6beaa48812137c8ad87fe464d27e371cfd40022467f8d10ac5f85ff16ef19215e340 SHA512 0503d0a6a0cf1ca9a9c57b831f320abb5102a3e7aa82c016d1f72c4d9f614ef53a0e4df30d50e05a98107fecacae4d70dfa5ee5c15910d575bc30df411430863
DIST nanoc-core-4.12.2.tar.gz 331400 BLAKE2B f7a22b05a4805f15a8e93601ae21bffdc19fe17c6550378465d85e63c498c5773c1dcd49d685b7d4367488300394c2f5bf9e6a6dc6aea589617a27fe1bd6ed4a SHA512 3fe574c061d8d0dd034137800c88a34844d246e6ab9a7816aadb03cd2c43b5fe6d614f42e6b41bcd4df98be551edc69e35ca992f2d5ee8158f9c7eb3c7635750
DIST nanoc-core-4.12.3.tar.gz 332692 BLAKE2B 8ae106366c66500ed06be841382bc1cc52c68ebc7ebec47a3f9dab278c7e17f886d0ce18c81ff73a83ec672353503155b447dfff5ba46f16bc2bfe891bb028a5 SHA512 737ce993c529643440d74e5072e2d63c2ce970d4d7637e7f225a79d3ac38907ced84928340d7bf5f11bcd02188b5cb1df0d4b03a8e000878ed924ab943db33a2
DIST nanoc-core-4.12.5.tar.gz 333312 BLAKE2B bdc50ba2868313f7b427a8292c8614230e9dcf472c5290e8fff39917cd5cedad217acbc36ef8524254c9839d965d824a98c99f9effa1e8cfb549e387d69f1032 SHA512 2e533076f62605a701275fd7813b6dbe09c2530ad38fb86db3a5d999bccd8f5ac93cf684ac882f00d81bbe1ec8cce69d45ecef1488efe3caf22f6a6ffca300e2
-EBUILD nanoc-core-4.11.12.ebuild 1601 BLAKE2B ab3a233a247f06871d20933a6bb29a6068eda5ae147b0c6dc26ac3bcdb42a1fb81c7bfe4d15c986fc46f7be10067d798f69a63dd2d840c9dc8dfb24924b29202 SHA512 6d11d1cbbb7465dab60af40b2c83887397ca5948b138bbe169753c5a6d5e189127cb9662c064731d555757b792a0e4351aaa062b46e3602e34ccadfd5211f665
+DIST nanoc-core-4.12.6.tar.gz 333932 BLAKE2B f5ff12ddd583c4a672c34a63b7f325a3ef6c18713f4e351482eb3c2a3dd5999b67ee0e1b7e8ab85899591824d8c47f19f3aa074790ae15f4616d589f762f2bb8 SHA512 343ec620d96ca086612c4babcadf33c4edcc39a02082f762568feaf226566c6d9b5441f53355ea03544b285e9a5ddc32aae0e67cc321b28336665d453f47b070
EBUILD nanoc-core-4.12.2.ebuild 1920 BLAKE2B 54f3f3f9651061564e236ebd37a5d48d84f3dfb37849d4c2872454ee376e478132baeddf2d78488507633ac16ffbdcb440e3e3a414f4a31c17c1ca509586a9f8 SHA512 98dff23360020f0d0ef1e351f15f4c9270b9d4d6a77b5e5fbad019c2b1134b5a795d34c9b71339fb02244c2e654b6252365ab65f485c9a6e8319fbfdca192fc9
EBUILD nanoc-core-4.12.3.ebuild 1935 BLAKE2B e41f23641b20bbd234c59981df1bdb968764fea169c48e058886c3f81d32684f8fa09e2f1aa7a92194d936c8807cd5494b71ad06122984f0e61dbd0a055f8b52 SHA512 6f076de31c575e20d9b71703ad99bdd080adb9b3e103655ff11591a766461a36d20085c7acd37a8afe846a4365ea23b58d3f467755ef5696548d66c178c4e977
EBUILD nanoc-core-4.12.5.ebuild 1941 BLAKE2B 703e9b630a575007537b6060daa44e1f3a6505a324d1106fc5cfabc68e61a39c420ab888d6434e6a78c2a08152a436ee79ffce9b63efd8a29f35060d8c0b638f SHA512 b6b4afb7493fc4631754f9b7fa70ca78cee405e5958cdb5c8decb22ac5544a2d8f61798c640d87267adfecad47699fc137606459b083feb2bbc36affba166f85
+EBUILD nanoc-core-4.12.6.ebuild 1948 BLAKE2B 2c4dbfba45b230a1b5c4178e8c568cdc6e0fe6d77b0f43438ded6fdbf88806ef66d179737751ce7bb9d6e33ed742697a0662ce490272b4fd10f901b52cd7b638 SHA512 208d52ca383c3cedf47272243c7855bd0dd111d705c4a554d088eb0bdf532fe38bd666706b298fc2b527f2ec7b577828afd8bb8f693e6d31881fa6a0f0cb3d59
MISC metadata.xml 318 BLAKE2B 62f33f86cd5bcb675e9ac02fef339514b88000be788a7037416bf6594e3f27bb07c5f7b49adbc39aa6aae4fdc7f076ebbb7f0fe897807a8e4a0b2252d5238546 SHA512 1098cd34add4d21c0c10aa42a539cec14c56b1835701b73346a57cac7ea3964b776b95d76cdffd6300577682e3a29976d9b65a0e2b8f984ee1bfb7601f2d7ef2
diff --git a/www-apps/nanoc-core/nanoc-core-4.11.12.ebuild b/www-apps/nanoc-core/nanoc-core-4.12.6.ebuild
index ccc331cdd62d..8ae89b598904 100644
--- a/www-apps/nanoc-core/nanoc-core-4.11.12.ebuild
+++ b/www-apps/nanoc-core/nanoc-core-4.12.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
@@ -15,7 +15,7 @@ HOMEPAGE="https://nanoc.ws/"
SRC_URI="https://github.com/nanoc/nanoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
SLOT="0"
IUSE="${IUSE} minimal"
@@ -24,12 +24,14 @@ DEPEND+="test? ( app-text/asciidoc app-text/highlight )"
RUBY_S="nanoc-${PV}/nanoc-core"
ruby_add_rdepend "
- dev-ruby/ddmemoize:1
+ >=dev-ruby/concurrent-ruby-1.1:1
dev-ruby/ddmetrics:1
dev-ruby/ddplugin:1
=dev-ruby/hamster-3*
>=dev-ruby/json_schema-0.19:0
+ >=dev-ruby/memo_wise-1.5:1
dev-ruby/slow_enumerator_tools:1
+ >=dev-ruby/tty-platform-0.2:0
>=dev-ruby/zeitwerk-2.1:2
"
@@ -40,10 +42,14 @@ ruby_add_bdepend "test? (
dev-ruby/fuubar
dev-ruby/minitest
dev-ruby/timecop
+ dev-ruby/tty-command
dev-ruby/yard
+ www-apps/nanoc-spec
)
"
+PATCHES=( "${FILESDIR}/${PN}-4.12.2-contracts.patch" )
+
all_ruby_prepare() {
# Avoid unneeded development dependencies
sed -i -e '/simplecov/I s:^:#:' \
@@ -58,6 +64,10 @@ all_ruby_prepare() {
# Use useable tmp dir
sed -i -e 's:/tmp/whatever:'${T}'/whatever:' spec/nanoc/core/checksummer_spec.rb || die
+
+ # Avoid circular dependency on www-apps/nanoc
+ sed -i -e '/.all_outdated/,/^ end/ s:^:#:' spec/nanoc/core/feature_spec.rb || die
+ rm -f spec/nanoc/core_spec.rb || die
}
each_ruby_test() {
diff --git a/www-apps/nanoc-deploying/Manifest b/www-apps/nanoc-deploying/Manifest
index 3693589e5354..320a954584f0 100644
--- a/www-apps/nanoc-deploying/Manifest
+++ b/www-apps/nanoc-deploying/Manifest
@@ -1,3 +1,5 @@
DIST nanoc-deploying-1.0.1.gem 9728 BLAKE2B d646f56eada30fc5059069627f6b07fc6620cc952605086100e954aa9b79e7f696ecfe87ad85f1951fca1de75482943af869a28f6f4465fffc3497af9db36b7f SHA512 78e4247021b9e0ba717cf4b41bb913bbbafd7e0b149d16e681d7312f60cd0d2277de5e957f938c3194a521036da21b38696fe4ced5cd0b14cdce01aee207a744
+DIST nanoc-deploying-1.0.2.gem 9728 BLAKE2B 6f06a33c08105e59a928277efccf48371d0c93f0cb4427951431462afc4b9d88c677ac17a2627f7511a7675a7b350c2887f62b88112c2d10e1e203a44252a387 SHA512 2ef340742926584ef5112d5c281ac469520d6fd30d60bfcf502ac993256020f85de03d957d61bff0613d3e8d9bda22256cc565feffe80411e3f024c5d8a74b2c
EBUILD nanoc-deploying-1.0.1.ebuild 617 BLAKE2B 137a627e44b9771d1a6ee38582172a8e7190bbd56ce396222540313ad421ecd7b9575a346bba23a7fe3d803bf8efae69ea8a986ee6606a1aa2b47024f108ebe4 SHA512 a443c4a542a4466f7504842e6822cd7f7c988b96faea4a19ac2da50f7c4ee302e3ae8cb4d2ddc62b436328806dd90c833af5a3d276376cfba38f0402b14b46c3
+EBUILD nanoc-deploying-1.0.2.ebuild 624 BLAKE2B 755a66802b419540f7d1352c9ef5c6c56edee4ce5ce3178ab4d9b4ea679a08cbb9b9b9763d72e1dd9bf70b0416962e1adbc24a7fe8bec93081fd3e62982f095f SHA512 975546e78e1ad29cb6c94fb2e77dab2d14d8803c23a734ab36ca4ad3f518617b1a74bbecd08c1862d52fbc33286ded3366a1b0f0d0a650e48f1a5c95f5c0ae4a
MISC metadata.xml 318 BLAKE2B 62f33f86cd5bcb675e9ac02fef339514b88000be788a7037416bf6594e3f27bb07c5f7b49adbc39aa6aae4fdc7f076ebbb7f0fe897807a8e4a0b2252d5238546 SHA512 1098cd34add4d21c0c10aa42a539cec14c56b1835701b73346a57cac7ea3964b776b95d76cdffd6300577682e3a29976d9b65a0e2b8f984ee1bfb7601f2d7ef2
diff --git a/www-apps/nanoc-deploying/nanoc-deploying-1.0.2.ebuild b/www-apps/nanoc-deploying/nanoc-deploying-1.0.2.ebuild
new file mode 100644
index 000000000000..ac61113398df
--- /dev/null
+++ b/www-apps/nanoc-deploying/nanoc-deploying-1.0.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby26 ruby27 ruby30"
+
+# Upstream has specs but they are not available in the gem and the
+# repository upstream is not tagged for this.
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides deploying functionality for Nanoc"
+HOMEPAGE="https://nanoc.ws/"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~riscv"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+ruby_add_rdepend "
+ www-apps/nanoc-checking:1
+ >=www-apps/nanoc-cli-4.11.15:0
+ >=www-apps/nanoc-core-4.11.15:0
+"
diff --git a/www-apps/nanoc-spec/Manifest b/www-apps/nanoc-spec/Manifest
index 192555a43c58..fda0ab0ea998 100644
--- a/www-apps/nanoc-spec/Manifest
+++ b/www-apps/nanoc-spec/Manifest
@@ -1,3 +1,3 @@
DIST nanoc-spec-0.0.2.gem 6656 BLAKE2B de90b2f63a15a7168d491cd33f8994a9ef8f7b13b23f6e32d50c2bdf8467a68e4205c24c9ca79efccc1a5076d2af25cf1a31c49c946e2ff0e7add9d5bcb99d1f SHA512 78202adfcc1e9b414a1b2f8d85bf5a0ab3e52473cc490145d0b63f5c6cbd4c29c1c56b06b343ad6bd6ba2818f464abc7ece3c3a0ccd9c2dd38771110ef573d7c
-EBUILD nanoc-spec-0.0.2.ebuild 481 BLAKE2B ff84566ded98aac97358d193981a171a2ec74b1dbb3e4e981b4dce5bd7109be117d1f15aa91d05fcf8db5cfb1393c7548240cf4b5d5205e05328b15178b1252c SHA512 c8760e7d4b86f230f9a395d6bee02061b6bf347f73892dc1909dba7dab9a3a06cd4430bc4fe6c56efd0e12a65de9dd3b85fc857b314d1ffebd7f9c23252a6ed3
+EBUILD nanoc-spec-0.0.2.ebuild 488 BLAKE2B b4ca198f00a0927295460c94a43c2ec3e882a05c8dcec62d086d9cca8de2dafa4fecda02b1987ddb21fe3f41daca8b0ca763f121e3db015cc7973d6bfab3a3c0 SHA512 8be782c4e90d8376d5bc59dcc67668485c43e064ebdb551019e94ba12901449da63b8976a458b8d619f00389207960473de73b56a112e293480fb13cd785f535
MISC metadata.xml 318 BLAKE2B 62f33f86cd5bcb675e9ac02fef339514b88000be788a7037416bf6594e3f27bb07c5f7b49adbc39aa6aae4fdc7f076ebbb7f0fe897807a8e4a0b2252d5238546 SHA512 1098cd34add4d21c0c10aa42a539cec14c56b1835701b73346a57cac7ea3964b776b95d76cdffd6300577682e3a29976d9b65a0e2b8f984ee1bfb7601f2d7ef2
diff --git a/www-apps/nanoc-spec/nanoc-spec-0.0.2.ebuild b/www-apps/nanoc-spec/nanoc-spec-0.0.2.ebuild
index de408edaee8e..1644eabc99b8 100644
--- a/www-apps/nanoc-spec/nanoc-spec-0.0.2.ebuild
+++ b/www-apps/nanoc-spec/nanoc-spec-0.0.2.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
RUBY_FAKEGEM_RECIPE_TEST="none"
diff --git a/www-apps/nanoc/Manifest b/www-apps/nanoc/Manifest
index f08ec7172b5a..7f6b706f4c28 100644
--- a/www-apps/nanoc/Manifest
+++ b/www-apps/nanoc/Manifest
@@ -1,9 +1,9 @@
-DIST nanoc-4.11.12.tar.gz 310160 BLAKE2B ef34bf6d28d5a9287053a939ef14bc59f99bde003d7bbcd7eee861ab882a6beaa48812137c8ad87fe464d27e371cfd40022467f8d10ac5f85ff16ef19215e340 SHA512 0503d0a6a0cf1ca9a9c57b831f320abb5102a3e7aa82c016d1f72c4d9f614ef53a0e4df30d50e05a98107fecacae4d70dfa5ee5c15910d575bc30df411430863
DIST nanoc-4.12.2.tar.gz 331400 BLAKE2B f7a22b05a4805f15a8e93601ae21bffdc19fe17c6550378465d85e63c498c5773c1dcd49d685b7d4367488300394c2f5bf9e6a6dc6aea589617a27fe1bd6ed4a SHA512 3fe574c061d8d0dd034137800c88a34844d246e6ab9a7816aadb03cd2c43b5fe6d614f42e6b41bcd4df98be551edc69e35ca992f2d5ee8158f9c7eb3c7635750
DIST nanoc-4.12.3.tar.gz 332692 BLAKE2B 8ae106366c66500ed06be841382bc1cc52c68ebc7ebec47a3f9dab278c7e17f886d0ce18c81ff73a83ec672353503155b447dfff5ba46f16bc2bfe891bb028a5 SHA512 737ce993c529643440d74e5072e2d63c2ce970d4d7637e7f225a79d3ac38907ced84928340d7bf5f11bcd02188b5cb1df0d4b03a8e000878ed924ab943db33a2
DIST nanoc-4.12.5.tar.gz 333312 BLAKE2B bdc50ba2868313f7b427a8292c8614230e9dcf472c5290e8fff39917cd5cedad217acbc36ef8524254c9839d965d824a98c99f9effa1e8cfb549e387d69f1032 SHA512 2e533076f62605a701275fd7813b6dbe09c2530ad38fb86db3a5d999bccd8f5ac93cf684ac882f00d81bbe1ec8cce69d45ecef1488efe3caf22f6a6ffca300e2
-EBUILD nanoc-4.11.12.ebuild 2670 BLAKE2B e129567600ce751c5c7c7e0e27370212d266a1346a057c639d75b1d70a3fcf3a1edbf6075d188cab9327eb3960cb98e6b9914423894991021ee55ef4f5784f5d SHA512 360ae7ed9f0352fe767e5e24b0cc30ac583c328563164eda854b00e73c8513b8b6184c67aab9beabadc30e14c624a043781781c99397ef14999e6c0a7d4064fe
+DIST nanoc-4.12.6.tar.gz 333932 BLAKE2B f5ff12ddd583c4a672c34a63b7f325a3ef6c18713f4e351482eb3c2a3dd5999b67ee0e1b7e8ab85899591824d8c47f19f3aa074790ae15f4616d589f762f2bb8 SHA512 343ec620d96ca086612c4babcadf33c4edcc39a02082f762568feaf226566c6d9b5441f53355ea03544b285e9a5ddc32aae0e67cc321b28336665d453f47b070
EBUILD nanoc-4.12.2.ebuild 2602 BLAKE2B 3d4ea73021b5fbff30c9ace8db0419a47be7017fd7770ea8e3596c1ff8408fabf45b5998bd3f86553a9d24393b75ffbc96363ed6981c80f2c0fd4bb8c7d68dd7 SHA512 55c25a24e2c0593cf8c18fcb574648cdf03e9f2470ab899b68dfaa4b5b3d36c3e7bbe526b43756863da5e90451129e7d55cd7b3dd69d40b5a4116cc71e648a14
EBUILD nanoc-4.12.3.ebuild 2526 BLAKE2B 7d4e688c97a6128c88998e58cea369c2c477758abf1e14c46e181784789ba7aecee6e73f46eed152dad0b874193cc0f614d0ef037d12a82f14b062efd1ec10ea SHA512 01ef7a2360d5911ea712c5cb6ad037f322803669de85495c5bb18fbaad00f5b8957f6105b7e8a80d5b4705092bf1f3bf2ead1ce9c18dd1186fd14f74a8959a59
EBUILD nanoc-4.12.5.ebuild 2534 BLAKE2B b050122de47295ece8340b901d0c5659af8d21fb8ca1c8c82e7177de75817ac0dbbae5b44531ce48719439e96e9b44442757961381464171102b071a95bfae42 SHA512 6254cd60fd6c6cdf4bc50e2f46540f7cd61d699f3f50012a0081320f1463899d9ce24765d1775238febdae83388a9e0198273b9c375ebd7a0658111880b556e1
+EBUILD nanoc-4.12.6.ebuild 2556 BLAKE2B a7fdfdc2dcf4363155c13a07cad0c1d2330d4847b209aa39f353eadf086321cc42e92abf2490ce2d95e31d2f39b757163a0119d04ba78a49ae87cecab09a6b95 SHA512 37d42b65c527a777c7877d730b1d84cbdd94d150f695863493d3f098624570236342744c727cc211ccebf3b06c604df76420ce852b38120e07aa5e481c090039
MISC metadata.xml 318 BLAKE2B 62f33f86cd5bcb675e9ac02fef339514b88000be788a7037416bf6594e3f27bb07c5f7b49adbc39aa6aae4fdc7f076ebbb7f0fe897807a8e4a0b2252d5238546 SHA512 1098cd34add4d21c0c10aa42a539cec14c56b1835701b73346a57cac7ea3964b776b95d76cdffd6300577682e3a29976d9b65a0e2b8f984ee1bfb7601f2d7ef2
diff --git a/www-apps/nanoc/nanoc-4.11.12.ebuild b/www-apps/nanoc/nanoc-4.12.6.ebuild
index de28a28b1206..0e4fee9a9436 100644
--- a/www-apps/nanoc/nanoc-4.11.12.ebuild
+++ b/www-apps/nanoc/nanoc-4.12.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
@@ -30,13 +30,12 @@ ruby_add_rdepend "!minimal? (
)
>=dev-ruby/addressable-2.5
>=dev-ruby/colored-1.2:0
- >=dev-ruby/cri-2.15:0
+ >=www-apps/nanoc-checking-1.0.2:1
+ ~www-apps/nanoc-cli-${PV}
~www-apps/nanoc-core-${PV}
+ www-apps/nanoc-deploying:1
>=dev-ruby/parallel-1.12:1
- >=dev-ruby/tomlrb-1.2:1
>=dev-ruby/tty-command-0.8:0
- >=dev-ruby/tty-file-0.7:0
- >=dev-ruby/tty-platform-0.2:0
>=dev-ruby/tty-which-0.4:0
"
@@ -67,9 +66,8 @@ doc? (
all_ruby_prepare() {
# Avoid unneeded development dependencies
- sed -i -e '/simplecov/,/SimpleCov.formatter/ s:^:#:' test/helper.rb || die
sed -i -e '/simplecov/I s:^:#:' \
- -e '/codecov/I s:^:#:' ../common/spec/spec_helper_head_core.rb || die
+ -e '/codecov/I s:^:#:' test/helper.rb ../common/spec/spec_helper_head_core.rb || die
sed -i -e '/coverall/I s:^:#:' \
-e '/rubocop/ s:^:#:' Rakefile || die
@@ -83,13 +81,12 @@ all_ruby_prepare() {
rm -f test/checking/checks/test_{css,html}.rb spec/nanoc/cli/commands/view_spec.rb || die
# Avoid tests for unpackaged dependencies
- rm spec/nanoc/deploying/fog_spec.rb \
- spec/nanoc/filters/less_spec.rb \
+ rm spec/nanoc/filters/less_spec.rb \
test/filters/test_{markaby,rainpress}.rb || die
# Avoid non-fatal failing tests due to specifics in the environment
- sed -i -e '145askip "gentoo"' spec/nanoc/cli/error_handler_spec.rb || die
- sed -i -e '/watches with --watch/askip "gentoo"' spec/nanoc/cli/commands/compile_spec.rb || die
+ #sed -i -e '145askip "gentoo"' spec/nanoc/cli/error_handler_spec.rb || die
+ #sed -i -e '/watches with --watch/askip "gentoo"' spec/nanoc/cli/commands/compile_spec.rb || die
sed -i -e '124askip "ordering issues"' -e '168askip "ordering issues"' spec/nanoc/data_sources/filesystem_spec.rb || die
}
diff --git a/www-apps/nextcloud-notify_push/Manifest b/www-apps/nextcloud-notify_push/Manifest
index 1412dc12ad38..09537425611c 100644
--- a/www-apps/nextcloud-notify_push/Manifest
+++ b/www-apps/nextcloud-notify_push/Manifest
@@ -633,4 +633,4 @@ EBUILD nextcloud-notify_push-0.2.1.ebuild 5870 BLAKE2B ed3fc061f7dbae8c36f8ae266
EBUILD nextcloud-notify_push-0.2.2.ebuild 6020 BLAKE2B 3ea673cab002654c4362ceb58e62b4026157c1fafb32c41bff33d2b6dac33d1e1fb2875c0d6cb20bca6850fa238bff07a786fa57ff89be9e489fb8d4ef579b85 SHA512 afa02e030f42e59d7d6ecb11230633bacf835da1091f8569d77aa075900270b006003cbe0ba3d18ab319023dd21470c56f4cdbdb46be45f599eaf460638b467b
EBUILD nextcloud-notify_push-0.2.4.ebuild 5816 BLAKE2B f81ffd23484da46657be53152c531691ed93a32b10ec4400b7eb9b75af8b88f84005f0912561571806b6564d8b4d3b2e3d25104b79b33d2fc9eee82aa7312f1c SHA512 ef081a5a1d619a3ad47db296dbde82e3bc8cd7161b07914caebbd41d6b3ae1d1264fc7184172503a13a937103500f3cc2f9e7083f358d39c65583e2255918367
EBUILD nextcloud-notify_push-0.3.0.ebuild 5701 BLAKE2B 7228aac087f81e62a2e2107848614c734fc826dd5ea357d0caf399db6f3f8b3435e5c9075f88e00389ee267535c6cc6bd2a4552de1cd93caae7b9a2b94679804 SHA512 15d37258f49229f82958c343514525a881493a2aebfab9c27b13ce8b7c48c68d8ba838762a7d2ce47103eeac1cee5f296a994ae21d0cc3d76a8a93a07b82311c
-MISC metadata.xml 407 BLAKE2B 09e8ff7f59db8683d478d3197f4b465ecfc2272e05e267084acef49c29a33652733282ce28df61b51d628c88c6333c8f2a86afed6aec457909b51e9380bd4438 SHA512 15fae1cdce4e157864413fb30f61a04a2b1aadbebd4ebe164262e0250c6133c86b5aa948f565d5b30a49eee270f7ffe6b7745d38819340887258439fa26cb064
+MISC metadata.xml 396 BLAKE2B 35460cb3787c4cde49913f87350782eb520deb2be40b45b5b91223de871cd03c5332f63b8d4938004ddcce9e9ad88630fda230511f60d4b963d28ae2c8c7b10c SHA512 02976ac66bca52fbf03111b555212267d5c8ca5007c75646d883b1eac01edee379cd55207b8874c95dcca6ef4c6e515202be443cd79eae1aad1e09c87c585552
diff --git a/www-apps/nextcloud-notify_push/metadata.xml b/www-apps/nextcloud-notify_push/metadata.xml
index d7c52629e770..2352e5762799 100644
--- a/www-apps/nextcloud-notify_push/metadata.xml
+++ b/www-apps/nextcloud-notify_push/metadata.xml
@@ -2,8 +2,8 @@
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>whissi@gentoo.org</email>
- <name>Thomas Deutschmann</name>
+ <email>dlan@gentoo.org</email>
+ <name>Yixun Lan</name>
</maintainer>
<upstream>
<bugs-to>https://github.com/nextcloud/notify_push/issues</bugs-to>
diff --git a/www-apps/nextcloud/Manifest b/www-apps/nextcloud/Manifest
index 84b7b5ca3ebd..fcaa457e73bf 100644
--- a/www-apps/nextcloud/Manifest
+++ b/www-apps/nextcloud/Manifest
@@ -1,14 +1,8 @@
AUX php-argon2-en.txt 416 BLAKE2B 9940a3e218d1db382790f4754352594c9098eccce7426729e75471f017e15bb45b50cc885609e54817077e36d9feb4484bcff5b40c4f669ad80d4d5a643da8bc SHA512 076bbbfb9305a2608b60fb7f9802a5a455c5d049d39c8f209eadac1a306ba2015d11a30b4544d8cdf43025077a3c3087f3e9922cd9b530a08c089a7818590115
-DIST nextcloud-21.0.5.tar.bz2 127542660 BLAKE2B b6c2bc642705ba5572a74a1f473e09a7be0ad6c4937b1a15d3b29bdad652872c373b9b6ab126c1ea90f32dced3fbb34505c82a7fc9d6913e407c6e43b97fe55b SHA512 ef8796cb17e6143dc1c9ccdea56105d0d7e2138eddae228724074b6360f99d0416a3682be047955b9a84dd6a961cdbb15ccff67ee6656a896699bbfa640d715d
-DIST nextcloud-21.0.9.tar.bz2 128237860 BLAKE2B 665d6c43300a595d745af3a2496e9865c5eedb84d99fcd94266fed8f6fd4889adc7dbbfbdccbd043ce5b68eea1af37f0513dc7b497fd585822bbcdab12507bce SHA512 77028d0064b171addaee9569b5d60b617b3d27ce86791393edcf099c5c2674e1f323932810fcba48869bc6b69e76fe9bdbab60ee02d7664b5fd91062e4e6822d
-DIST nextcloud-22.2.6.tar.bz2 131746258 BLAKE2B 4a259b13beb1c061a0c789b87f7d3fbc82154f4784ce3c616f1d1e1d8d4bb383a46586a1e5c3e30f2545d8447b633c7c5a114dba8d583c0b8a285d69ee762093 SHA512 e221026b08096c7a99043a37300a33f0396f475b121406e4d2c6fe295b4bd3d8d21ecf0c2b5a352b0ca5a66fdb6f882a945ed8ecb2cc5b3c54ad27681d78b3bf
-DIST nextcloud-22.2.7.tar.bz2 131669340 BLAKE2B a20aeb22a6ba6d13318821b7b9e1acbbe25cbec9cbb94ed8502dc1bb8369a589404dc7595dc18f51f8fa66c612ed0b0e9869aa1c7211fde9c345a249c7ca7c2e SHA512 cdeafbf9089c42836fffc3b2c7c4898a27e0c5de09b942e6f69a0c70aec570de2386bc45343ad8c71db24401154473d283edb7c442988ba253a87d2cd53064c0
-DIST nextcloud-23.0.3.tar.bz2 139983015 BLAKE2B 271d247d66c80e2b342e435ec5b1a627703e09adc373e52a3bfe0a0802b698759c25904e6c489033ba3f6028155b5c0c5bcbcb2378089eddefe2dd967ecabe4b SHA512 406e9c0615447ffa9f77104e067d1d6b73262d78388e531ebcd8de3a759260a26bf08461997a8513ce910b8de81775d6ccad65a26f38e159014aebf6a555aa23
-DIST nextcloud-23.0.4.tar.bz2 140409123 BLAKE2B 6202ca26c1fd2839cd46651dfb727e20ea8eaab5329aedb905d23817ed3399ce999aff3161f0a6301d558a7acf537b8b54befeabe831e132a56b22bc3c13e635 SHA512 f43acf7c9df6e3105d9085bf9b4c95eebca83812980b933cd57920dec5684c34fe47e8f5395aa7eed806c75f13049790a30b2f8abce8738f9e8a55b24280871f
-EBUILD nextcloud-21.0.5.ebuild 1081 BLAKE2B 89d3edc2aa3f41b8bfc2a1a1d59d886d71c77b41c4681e1abff33471e5a336c4b800872d2f3369325ee15c7b9eafeec51d65e6de113017345753ce416f9e732c SHA512 c5fcae9887cdc570c820c94314319b9c597418be7ad378fa78d7c6a16481fadb850a3d6fb6ba8b0973c46c159fee3f56da9c5e6409ab435258aaab0a824893bc
-EBUILD nextcloud-21.0.9.ebuild 1083 BLAKE2B b036df116d245be11fb8ac26716cb0e26e8a910b05150d5377b10ff84275f48b02c04f4c2b477f06f76564992dbaa391b45555d44714afc306941c3e45586f42 SHA512 46430f577e15de602f40a5470c1d5a13de049d08c7879c144e8bffe7eb32135b294f0f403a2b3cadd54d1fd522892d4937b8d3c049b232533dfc1685f894fe37
-EBUILD nextcloud-22.2.6.ebuild 1083 BLAKE2B b036df116d245be11fb8ac26716cb0e26e8a910b05150d5377b10ff84275f48b02c04f4c2b477f06f76564992dbaa391b45555d44714afc306941c3e45586f42 SHA512 46430f577e15de602f40a5470c1d5a13de049d08c7879c144e8bffe7eb32135b294f0f403a2b3cadd54d1fd522892d4937b8d3c049b232533dfc1685f894fe37
-EBUILD nextcloud-22.2.7.ebuild 1083 BLAKE2B b036df116d245be11fb8ac26716cb0e26e8a910b05150d5377b10ff84275f48b02c04f4c2b477f06f76564992dbaa391b45555d44714afc306941c3e45586f42 SHA512 46430f577e15de602f40a5470c1d5a13de049d08c7879c144e8bffe7eb32135b294f0f403a2b3cadd54d1fd522892d4937b8d3c049b232533dfc1685f894fe37
-EBUILD nextcloud-23.0.3.ebuild 1081 BLAKE2B 12416bb95d60bbc1a105a62079176135b65fe17e05b4008991e5c8b17fee813bdefb24dba9911315a54de1fb1325236a59f9ab6b3b8b0e38e4a7bbfb0a044567 SHA512 bfbdc2cc665179a1d4ed9bcaa34c8284bce1e78e2f987cc2f490e8d52b010fe3c1e00e8201e729b895cc45614863731a9d6c3b5dcc72e04604eea530fe63ffc4
-EBUILD nextcloud-23.0.4.ebuild 1083 BLAKE2B b036df116d245be11fb8ac26716cb0e26e8a910b05150d5377b10ff84275f48b02c04f4c2b477f06f76564992dbaa391b45555d44714afc306941c3e45586f42 SHA512 46430f577e15de602f40a5470c1d5a13de049d08c7879c144e8bffe7eb32135b294f0f403a2b3cadd54d1fd522892d4937b8d3c049b232533dfc1685f894fe37
-MISC metadata.xml 645 BLAKE2B 1347bd3fcd02b3e541da305002e905cfc9114307ef1988401e6f8443d54e73b897a37557e4ae1e225ffde3897d6b0d448a0a0859cfab6d81d11b1b9226a734cf SHA512 1aa361e4cf6c13ffa18945645ecf7754721397ef6aa289e56e532435e69d1024e94714907f2c3870b7e0b234f329ec6592e62c69969de69499597f25b64ac0d5
+DIST nextcloud-22.2.8.tar.bz2 131507024 BLAKE2B 3c2a57332d4592f351ab2ef550abe8ae911cf2a1e6a65d8fa7983dd63ef38eb92f9facb37405d28e20244327cf370620db71793178563903bcf438ad059089ef SHA512 4bd3c7cb6c56c737d03e6c297a02dcbcf9b24c0c6c5367088d0067d1a897afadc3f38ed13d2a180ccbbf7dce70a00819ffebfc47dcd27ddc4a628c50c1636d92
+DIST nextcloud-23.0.5.tar.bz2 140493624 BLAKE2B 13c524a2f26affd3c078210cf1552b1af044fdcd3c6cdcb2a2bde50808bf2953bbb658efa13ebff8806b2e2deb9ff23e36c0cbd7d8bea17329a6fe7e2845f1b8 SHA512 460ddfa994cf1e9423efa8e940dd1beebec17a99bdf78c238384554618b9590405e58c31bf29b011b7fd41cdd21f183053fc9ef6bd245ca9f47d43a19870a0e4
+DIST nextcloud-24.0.1.tar.bz2 123379803 BLAKE2B fc00f22cf1ed9e09da29ed5681f5e1fa5c46df80ba81f26680391effa1f68b9022879b05d1f92402e7c3c3982c755491eeab151880d7532425b3f230a7ab8166 SHA512 29746cd27356ee81c310854b714189a3d1a3817683cc29706af3d76daa70ceeb1201ead92ba3f6ac0de4c6ccdf6a9bbcf646246dd213fbc85638f92e0d73a2d2
+EBUILD nextcloud-22.2.8.ebuild 1083 BLAKE2B b036df116d245be11fb8ac26716cb0e26e8a910b05150d5377b10ff84275f48b02c04f4c2b477f06f76564992dbaa391b45555d44714afc306941c3e45586f42 SHA512 46430f577e15de602f40a5470c1d5a13de049d08c7879c144e8bffe7eb32135b294f0f403a2b3cadd54d1fd522892d4937b8d3c049b232533dfc1685f894fe37
+EBUILD nextcloud-23.0.5.ebuild 1081 BLAKE2B 12416bb95d60bbc1a105a62079176135b65fe17e05b4008991e5c8b17fee813bdefb24dba9911315a54de1fb1325236a59f9ab6b3b8b0e38e4a7bbfb0a044567 SHA512 bfbdc2cc665179a1d4ed9bcaa34c8284bce1e78e2f987cc2f490e8d52b010fe3c1e00e8201e729b895cc45614863731a9d6c3b5dcc72e04604eea530fe63ffc4
+EBUILD nextcloud-24.0.1.ebuild 1083 BLAKE2B 55f30c1489c3358c7cd85ad2df85f92714f81d2cd39c33e555ab8cc3ac3f0679df587bbc1400fef0952efab213a5bb7b663510845ce72a2b8ff1d08b4a4f14d6 SHA512 dcd8e897daef37e0aef08338a8a44e975dd7b91feb82bc8b13fd4c0dd031ff6bc041aaef01c02423bb6ba1f1f4d01354cdede5173b7262c04406c90433a945c7
+MISC metadata.xml 533 BLAKE2B bbbb5b440e2d38d6882451584a997c4b21b2afcb8e8da8c8dd9fcaf00fdae0a3643413d3619401faa3875f93cdbd1a090db308b72d315711e859405757d4df7f SHA512 a18ee96f8aae2ed8c66faa777a303bb45eb27c49c25ff56e5f01ef4a4f9df03ef0581ad92084e37683ece26b1c25c1a9ec843d1219964954d19c2bcfbe3f4a0a
diff --git a/www-apps/nextcloud/metadata.xml b/www-apps/nextcloud/metadata.xml
index fac2fb230a78..baa96ed778c1 100644
--- a/www-apps/nextcloud/metadata.xml
+++ b/www-apps/nextcloud/metadata.xml
@@ -5,10 +5,6 @@
<email>voyageur@gentoo.org</email>
<name>Bernard Cafarelli</name>
</maintainer>
- <maintainer type="person">
- <email>polynomial-c@gentoo.org</email>
- <name>Lars Wendler</name>
- </maintainer>
<maintainer type="project">
<email>web-apps@gentoo.org</email>
<name>Gentoo Webapps</name>
diff --git a/www-apps/nextcloud/nextcloud-21.0.5.ebuild b/www-apps/nextcloud/nextcloud-21.0.5.ebuild
deleted file mode 100644
index facb26136365..000000000000
--- a/www-apps/nextcloud/nextcloud-21.0.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit webapp
-
-DESCRIPTION="Personal cloud that runs on your own server"
-HOMEPAGE="https://nextcloud.com/"
-SRC_URI="https://download.nextcloud.com/server/releases/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="+curl +imagemagick mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-lang/php[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
- imagemagick? ( dev-php/pecl-imagick )
- virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
- webapp_pkg_setup
-}
-
-src_install() {
- webapp_src_preinst
-
- insinto "${MY_HTDOCSDIR}"
- doins -r .
- dodir "${MY_HTDOCSDIR}"/data
-
- webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
- webapp_serverowned -R "${MY_HTDOCSDIR}"/data
- webapp_serverowned -R "${MY_HTDOCSDIR}"/config
- webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
- webapp_postinst_txt en "${FILESDIR}"/php-argon2-en.txt
-
- webapp_src_install
-}
diff --git a/www-apps/nextcloud/nextcloud-22.2.6.ebuild b/www-apps/nextcloud/nextcloud-22.2.6.ebuild
deleted file mode 100644
index b49730459a5f..000000000000
--- a/www-apps/nextcloud/nextcloud-22.2.6.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit webapp
-
-DESCRIPTION="Personal cloud that runs on your own server"
-HOMEPAGE="https://nextcloud.com/"
-SRC_URI="https://download.nextcloud.com/server/releases/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+curl +imagemagick mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-lang/php[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
- imagemagick? ( dev-php/pecl-imagick )
- virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
- webapp_pkg_setup
-}
-
-src_install() {
- webapp_src_preinst
-
- insinto "${MY_HTDOCSDIR}"
- doins -r .
- dodir "${MY_HTDOCSDIR}"/data
-
- webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
- webapp_serverowned -R "${MY_HTDOCSDIR}"/data
- webapp_serverowned -R "${MY_HTDOCSDIR}"/config
- webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
- webapp_postinst_txt en "${FILESDIR}"/php-argon2-en.txt
-
- webapp_src_install
-}
diff --git a/www-apps/nextcloud/nextcloud-22.2.7.ebuild b/www-apps/nextcloud/nextcloud-22.2.7.ebuild
deleted file mode 100644
index b49730459a5f..000000000000
--- a/www-apps/nextcloud/nextcloud-22.2.7.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit webapp
-
-DESCRIPTION="Personal cloud that runs on your own server"
-HOMEPAGE="https://nextcloud.com/"
-SRC_URI="https://download.nextcloud.com/server/releases/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+curl +imagemagick mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-lang/php[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
- imagemagick? ( dev-php/pecl-imagick )
- virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
- webapp_pkg_setup
-}
-
-src_install() {
- webapp_src_preinst
-
- insinto "${MY_HTDOCSDIR}"
- doins -r .
- dodir "${MY_HTDOCSDIR}"/data
-
- webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
- webapp_serverowned -R "${MY_HTDOCSDIR}"/data
- webapp_serverowned -R "${MY_HTDOCSDIR}"/config
- webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
- webapp_postinst_txt en "${FILESDIR}"/php-argon2-en.txt
-
- webapp_src_install
-}
diff --git a/www-apps/nextcloud/nextcloud-21.0.9.ebuild b/www-apps/nextcloud/nextcloud-22.2.8.ebuild
index b49730459a5f..b49730459a5f 100644
--- a/www-apps/nextcloud/nextcloud-21.0.9.ebuild
+++ b/www-apps/nextcloud/nextcloud-22.2.8.ebuild
diff --git a/www-apps/nextcloud/nextcloud-23.0.3.ebuild b/www-apps/nextcloud/nextcloud-23.0.5.ebuild
index b398da7a1cb9..b398da7a1cb9 100644
--- a/www-apps/nextcloud/nextcloud-23.0.3.ebuild
+++ b/www-apps/nextcloud/nextcloud-23.0.5.ebuild
diff --git a/www-apps/nextcloud/nextcloud-23.0.4.ebuild b/www-apps/nextcloud/nextcloud-24.0.1.ebuild
index b49730459a5f..3c8e3b4c7564 100644
--- a/www-apps/nextcloud/nextcloud-23.0.4.ebuild
+++ b/www-apps/nextcloud/nextcloud-24.0.1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit webapp
diff --git a/www-apps/nikola/Manifest b/www-apps/nikola/Manifest
index 01f3c5db4213..d64e863e19ac 100644
--- a/www-apps/nikola/Manifest
+++ b/www-apps/nikola/Manifest
@@ -1,3 +1,3 @@
-DIST Nikola-8.1.3.tar.gz 4340545 BLAKE2B 535870b7cd147169b511166186ac200ab9d31d976c58363e42235e07ea8ba68e01738d378190663864e6a8605986771500569004e7a73ea043ae8982be09afe1 SHA512 7b6a8391d023a339125392082cc3d2ea2a2fe25b8938bd82b8c9efe0cbb3e8b83537f1bd00d97a648e3fc2b096e673702026fa3942ab9c97e76bf21b5afefe16
-EBUILD nikola-8.1.3.ebuild 2198 BLAKE2B 1d64ba030d176676dd0670fca9ccd8de90eb78fd4badb09182ed9418fd8a046ca882d09f0572f2be7f5e763dd24f264e28c1d3362437d376e8110c11371677c3 SHA512 2106be3afce054b5557db657fd87ad9897fb9e99545edaa0caa29fd983eba71a87a1d6ba9455b6154fefe15020224105005e72e66eafceebba1a20d88faa07b2
-MISC metadata.xml 1215 BLAKE2B 2db59843fa03f315486d76c2e49cf35d3c6e8b44faee18058a876352e5d30d5398b533a5bb89f19e975c5d676e683d8ee5eab50952e8212cb1225ad36d2bf2b0 SHA512 262e25578f4d8946400112ff1228b3f39b2a1a533b8449768ebf5083543893dbbdff7f2e28d3a14394e9d2be6deafe066379a771fffc09c62fd50592dd33ed95
+DIST Nikola-8.2.2.tar.gz 5483145 BLAKE2B 78950e97016b7a87d41739684de102c548a5dfecfe9c1239a94c757a4d7d00f5d77bf679b6ed1a853aa46e1fcb78c27e7c2276e7aafeb874c0e21c1ae9f1cbb2 SHA512 f2bf38c81c2e01f6d6cb6a24d9b9ea95f047e9bd9987437df61cf1cb10c39c5f9259e8baa4c64dc24e4f69dc3b3e35e3553dced7d42c840645e024d6c21eb9ae
+EBUILD nikola-8.2.2-r1.ebuild 2086 BLAKE2B adecf09a7e847882349655c3739876917d92dd4d5533ef6a6e20829ef8542f08f8835724d8829bdc36a4a6c759b8275e377992dfc874299944ab5ce52ea88468 SHA512 c05dfc6bdac3969c604684f64932d4218e7213ee612c8183380d8b4befe5fbe9b7e26fc1d13f5d061307af9ddc0061ad4f9372035a8a1361cb00c01d734d6d6f
+MISC metadata.xml 292 BLAKE2B 0042bf60cec1af73f2d8e977e53c42adf5c7e4500f02ee08e3673b25962a86905d1d07783fb519a3bf40a12ab64229879e5fb217d1bde97195573fc6faa69f66 SHA512 a8e6a37da4e290629b38ccb4f9087682de58a0e4e4a377b85c3f3bb06eba426e3689cab575f528511fde9ed308e12a2e79a318e4dc55c6f85c3d8e16e22b3d01
diff --git a/www-apps/nikola/metadata.xml b/www-apps/nikola/metadata.xml
index db71581d0733..d03a91b8243b 100644
--- a/www-apps/nikola/metadata.xml
+++ b/www-apps/nikola/metadata.xml
@@ -2,37 +2,8 @@
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>whissi@gentoo.org</email>
- <name>Thomas Deutschmann</name>
+ <email>ulm@gentoo.org</email>
</maintainer>
- <use>
- <flag name="assets">
- Support web asset management
- </flag>
- <flag name="charts">
- Support chart generation through <pkg>dev-python/pygal</pkg>
- </flag>
- <flag name="hyphenation">
- Add hyphenation support through <pkg>dev-python/pyphen</pkg>
- </flag>
- <flag name="ipython">
- Add IPython notebook compilation and LESS support
- </flag>
- <flag name="jinja">
- Add support for <pkg>dev-python/jinja</pkg> as alternative templating
- engine to Mako
- </flag>
- <flag name="server">
- Enable support for built-in web server using <pkg>dev-python/aiohttp</pkg>
- </flag>
- <flag name="watchdog">
- Use <pkg>dev-python/watchdog</pkg> to monitor file system events
- </flag>
- <flag name="webmedia">
- Use <pkg>dev-python/micawber</pkg> to extract metadata from web media
- links
- </flag>
- </use>
<upstream>
<remote-id type="pypi">Nikola</remote-id>
</upstream>
diff --git a/www-apps/nikola/nikola-8.1.3.ebuild b/www-apps/nikola/nikola-8.2.2-r1.ebuild
index c7955e4d67ec..efa4bce006ed 100644
--- a/www-apps/nikola/nikola-8.1.3.ebuild
+++ b/www-apps/nikola/nikola-8.2.2-r1.ebuild
@@ -1,11 +1,11 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+EAPI=8
+PYTHON_COMPAT=( python3_{8,9,10} )
DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
+inherit distutils-r1 optfeature
MY_PN="Nikola"
MY_P="${MY_PN}-${PV}"
@@ -13,12 +13,11 @@ MY_P="${MY_PN}-${PV}"
DESCRIPTION="A static website and blog generator"
HOMEPAGE="https://getnikola.com/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
LICENSE="MIT Apache-2.0 CC0-1.0 public-domain"
SLOT="0"
KEYWORDS="amd64 ~riscv"
-IUSE="assets charts hyphenation ipython jinja server watchdog webmedia"
-REQUIRED_USE="server? ( watchdog )"
RESTRICT="test" # needs coveralls
DEPEND=">=dev-python/docutils-0.13[${PYTHON_USEDEP}]" # needs rst2man to build manpage
@@ -38,24 +37,24 @@ RDEPEND="${DEPEND}
>=dev-python/unidecode-0.04.16[${PYTHON_USEDEP}]
>=dev-python/yapsy-1.11.223[${PYTHON_USEDEP}]
dev-python/pillow[jpeg,${PYTHON_USEDEP}]
- dev-python/cloudpickle[${PYTHON_USEDEP}]
- assets? ( >=dev-python/webassets-0.10.1[${PYTHON_USEDEP}] )
- charts? ( >=dev-python/pygal-2.0.1[${PYTHON_USEDEP}] )
- hyphenation? ( >=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}] )
- ipython? ( >=dev-python/ipython-2.0.0[notebook,${PYTHON_USEDEP}] )
- jinja? ( >=dev-python/jinja-2.7.2[${PYTHON_USEDEP}] )
- server? ( dev-python/aiohttp[${PYTHON_USEDEP}] )
- watchdog? ( >=dev-python/watchdog-0.8.3[${PYTHON_USEDEP}] )
- webmedia? ( >=dev-python/micawber-0.3.0[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
+ dev-python/cloudpickle[${PYTHON_USEDEP}]"
src_install() {
distutils-r1_src_install
# hackish way to remove docs that ended up in the wrong place
- rm -rv "${ED}/usr/share/doc/${PN}" || die
+ rm -r "${ED}/usr/share/doc/${PN}" || die
dodoc AUTHORS.txt CHANGES.txt README.rst docs/*.rst
gunzip "${ED}/usr/share/man/man1/${PN}.1.gz" || die
}
+
+pkg_postinst() {
+ optfeature "chart generation" dev-python/pygal
+ optfeature "hyphenation support" dev-python/pyphen
+ optfeature "notebook compilation and LESS support" dev-python/ipython
+ optfeature "alternative templating engine to Mako" dev-python/jinja
+ optfeature "built-in web server support" dev-python/aiohttp
+ optfeature "monitoring file system events" dev-python/watchdog
+ optfeature "extracting metadata from web media links" dev-python/micawber
+}
diff --git a/www-apps/novnc/Manifest b/www-apps/novnc/Manifest
index b9cbdce80766..6a4d2153bd99 100644
--- a/www-apps/novnc/Manifest
+++ b/www-apps/novnc/Manifest
@@ -1,4 +1,4 @@
DIST novnc-1.2.0.tar.gz 1356408 BLAKE2B a84b767afcdaa641a21943d19ac93c9200074c24c83c899fe2452a82eef526ecd74de92da47b3caa85abe9d51f2fb8d5078f3bf66c0868a241218d22a9088239 SHA512 461490da7bb983e9c94b8ce39f8455ee6609b5a9df8d88254bcc37ebaa5153f5ee9db6afbd88b51762d6d55661bc5cde6fbe70616597583bfce1203e337adf75
-EBUILD novnc-1.2.0.ebuild 1078 BLAKE2B 6f4f4b3c6d53c36b6c43319e26038d24323c5a2591ccb1280199bc41750cc159d8af6eea20a7ff7b0939526e33d6d3d521432bbd2d6f08c881f7a389cee1a804 SHA512 41c95a1dc895e8b0e65b7be349ced130900306205ce757c3b911c04c7e3c100cfda9c788799abb7d222e7593d202e107f4bda5811107de772309676c83c31e9d
-EBUILD novnc-9999.ebuild 1077 BLAKE2B 33df3de2f21860fa4ff6b3f488d3a2bd2f03857976b21376ff06441e9da2757fa816537976727f118f8335f706732e5d9724a7cbda4f81284602b673847ad6ae SHA512 ac6c12531f0ea764abd19c24c87355dabda8eada3ca7f1b64c8d7b0fa794ee8ea53c66aa0c2fd75be9c70d665c2e6d2d234d00b2f5671664e2c6809ab23d5138
+EBUILD novnc-1.2.0.ebuild 1079 BLAKE2B ee4bad76f19301917ac09cb5b480fedd3f47ca5480c2bb38d2ca27f9044819622f8bb2b30e60fff2572e4abae934bd2f853fa52ea65cef1515c2e14d01aef00a SHA512 381e2030a98e8722cf63342558db862172a5c2b9ec22699fffe3dd1e64ac41ec62237be2ea3babb5fdfda19fa045896873895b4abf2dbfbee514de22a9ddb43f
+EBUILD novnc-9999.ebuild 1078 BLAKE2B a24ce5ec1999ed553b211d49e7725a5aba1ed8050cbad360e5710ea99e1565de3334ac300f28c5f3b73b6f8d4bae16122970c69a611d3d8f64488a64fab9ea07 SHA512 7dc0e286f88eee0018a56b7e31d585d9abe42d5f42115cd0c00cc6df4fdb6e843385269cf58a1a62f5986817b28d52cab1b55ef68dc889083918cb0f3b9d9ad9
MISC metadata.xml 367 BLAKE2B 3c3734e6bec10d5312464c3bf27ba6c3e1cdc7689165b461f617ca3fffd9c95739821c280ae78ea3ab69d6eb2166b82dcee2330c132dee527753522a75df2045 SHA512 13ee4b658e79907c7c59bf69160d41e9db7f7e865329fd03a9be6024b134a9a8a832f7b2b218ea29c647dfcdf3c61d0932c539e6f02117d4192a20fa9f74fc8e
diff --git a/www-apps/novnc/novnc-1.2.0.ebuild b/www-apps/novnc/novnc-1.2.0.ebuild
index 287051b334b2..1076ed3f41ef 100644
--- a/www-apps/novnc/novnc-1.2.0.ebuild
+++ b/www-apps/novnc/novnc-1.2.0.ebuild
@@ -4,7 +4,7 @@
EAPI=7
DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
inherit distutils-r1
DESCRIPTION="noVNC is a VNC client implemented using HTML5 technologies"
diff --git a/www-apps/novnc/novnc-9999.ebuild b/www-apps/novnc/novnc-9999.ebuild
index a061cad3709f..6b01b8479bea 100644
--- a/www-apps/novnc/novnc-9999.ebuild
+++ b/www-apps/novnc/novnc-9999.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
inherit distutils-r1
DESCRIPTION="noVNC is a VNC client implemented using HTML5 technologies"
diff --git a/www-apps/owncloud/Manifest b/www-apps/owncloud/Manifest
index 6fe6889db69a..78785c1b166a 100644
--- a/www-apps/owncloud/Manifest
+++ b/www-apps/owncloud/Manifest
@@ -1,7 +1,3 @@
-DIST owncloud-10.8.0.tar.bz2 24917781 BLAKE2B 909a8b51034fe07f83adcb3aff9c8eab790da40b115ecc715c4307ecb0364d5f65d75178d76ff27969b28a46f9585915412db235120dbb8600809057eea3c7f1 SHA512 47a23e5c2946e5d4c1d8c8e6d1b754e2a2bce436af532dbc7aa36c8031185fcc28b500fefa064e5290f2af68cbea823fa893acdb90307c9eddf53e126d282c96
-DIST owncloud-10.9.0.tar.bz2 64571921 BLAKE2B d091802d8e8e957232821c2c97a97a4f7ba610be30e7a70161e35c272729846a389c4e6e8d3a045e021fe51390678f8b942273832c233cadc8e4d573265fde7e SHA512 4cf4b420899a3847cd1e9e1ef797528a1c625546ebaa1c116161ab3289b21524a69844602910cd576b0e5c37cd38d986f0e7b87f1990c725506d6da6d6ef4078
-DIST owncloud-10.9.1.tar.bz2 64725210 BLAKE2B 9ecf7fda2577e803af37bf5741a1348f764bc039bfe574804044648317ff9a0d9a56cbe31900b5c83a46326ba63f10e27251b5bbf8a6c5df8359ba9d0771558e SHA512 b1fad9ace968d7c47699777baba284b98b98ad404e5211370031656d2e02aac9c4c9a771950c4e7a62484501da3e0d45ca279326a0b69c8eaa711a530df3816f
-EBUILD owncloud-10.8.0.ebuild 1255 BLAKE2B f55f9ff5dd004fd7408fb490cbc723bae315c55a68e72db1b4a458cdbe48c6e2e322fcc29d9b916679dd1be3097d9c8d6ac76fb266ca8eff446cc5d04a8c11c3 SHA512 c151fd9fbc8bfc7f7ab94729d8f11af150d1da1ed0e78943bd2f81206fbb7b8e913ceec63881655008cab4c69c86852ad1c850580df4dc678f389885e4e1f9e9
-EBUILD owncloud-10.9.0.ebuild 1255 BLAKE2B f55f9ff5dd004fd7408fb490cbc723bae315c55a68e72db1b4a458cdbe48c6e2e322fcc29d9b916679dd1be3097d9c8d6ac76fb266ca8eff446cc5d04a8c11c3 SHA512 c151fd9fbc8bfc7f7ab94729d8f11af150d1da1ed0e78943bd2f81206fbb7b8e913ceec63881655008cab4c69c86852ad1c850580df4dc678f389885e4e1f9e9
-EBUILD owncloud-10.9.1.ebuild 1255 BLAKE2B 7c25415c6ca5eb880a139f643b62e24d3ee83cd678f7f1c0bb9be78cf01a0d2f98c7a5948255218d58b01d3579d73a9866c2438f74e008a049f3469a70e8ef00 SHA512 114819dfbe398f10f2801cebc63ba2872af381ba2195627bf14c178f504f09a11aecdad42498d1761dd904df461c830f208d4e08b09ff0cf48f91e9990d40b9c
+DIST owncloud-10.10.0.tar.bz2 65066915 BLAKE2B 014320d33d18d07390ceeb773e8513d1135038974cdfab6cf688771237cbc924f00a25d47fe1e77b39d84718f21fb5e5d5cb202e44b8e7ce77a5dc4393db5023 SHA512 aedd71696ad85b03ecbc26dd064d07b7e3f1ddbeddcec4090674cebf4debc40c555f2b232615e3c089f5525c04e0dd8cf113c7284c99ef7da2cef7193f20fee7
+EBUILD owncloud-10.10.0.ebuild 1259 BLAKE2B a1be11e3faf8c89c26594f7ddcf28471c9cba039f5c575c0e602d617e5c88aaa58c8db26f7a1e2d8f04fbd20c6b1be54872edae5c77dcd16376ed1844649d0a6 SHA512 8b41a8ab7cebf790b0c2781d0bf1168f5d937c52a8588cd929d7da1cb3858b3431307acfd203771b82a850b17f637adc45a02a50bdf36788d1275061f42c5b6e
MISC metadata.xml 363 BLAKE2B f3e41cd23ac1e4e6d8cddfc0291f626fe7e28379dc886a9bf9ea9ae9bfd94b646ecd6dcc7af9d808bd579f69728279bad991bd940777ab2cae199b805729daad SHA512 0e0200aa0ae268650f684d22f40701d3259cbdcca639042edd9fd875bfc218b217310238f5b9b97658917023bdf1fa5ed7aab82f068b4a03752b718138ff79ed
diff --git a/www-apps/owncloud/owncloud-10.9.1.ebuild b/www-apps/owncloud/owncloud-10.10.0.ebuild
index 564f99a8ba57..71d8e6808dff 100644
--- a/www-apps/owncloud/owncloud-10.9.1.ebuild
+++ b/www-apps/owncloud/owncloud-10.10.0.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit webapp
DESCRIPTION="Web-based storage application where all your data is under your own control"
HOMEPAGE="https://owncloud.org"
-SRC_URI="https://download.owncloud.org/community/${P}.tar.bz2"
+SRC_URI="https://download.owncloud.com/server/stable/${P}.tar.bz2"
LICENSE="AGPL-3"
KEYWORDS="~amd64 ~arm ~x86"
diff --git a/www-apps/owncloud/owncloud-10.8.0.ebuild b/www-apps/owncloud/owncloud-10.8.0.ebuild
deleted file mode 100644
index e7ba0f1d7abb..000000000000
--- a/www-apps/owncloud/owncloud-10.8.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit webapp
-
-DESCRIPTION="Web-based storage application where all your data is under your own control"
-HOMEPAGE="https://owncloud.org"
-SRC_URI="https://download.owncloud.org/community/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+curl mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND=">=dev-lang/php-7.0[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,xmlreader,xmlwriter,zip]
- virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
- webapp_pkg_setup
-}
-
-src_install() {
- webapp_src_preinst
-
- insinto "${MY_HTDOCSDIR}"
- doins -r .
- dodir "${MY_HTDOCSDIR}"/data
-
- webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
- webapp_serverowned -R "${MY_HTDOCSDIR}"/data
- webapp_serverowned -R "${MY_HTDOCSDIR}"/config
- webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
- webapp_src_install
-}
-
-pkg_postinst() {
- elog "Additional applications (calendar, ...) are no longer provided by default."
- elog "You can install them after login via the applications management page"
- elog "(check the recommended tab). No application data is lost."
- webapp_pkg_postinst
-}
diff --git a/www-apps/owncloud/owncloud-10.9.0.ebuild b/www-apps/owncloud/owncloud-10.9.0.ebuild
deleted file mode 100644
index e7ba0f1d7abb..000000000000
--- a/www-apps/owncloud/owncloud-10.9.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit webapp
-
-DESCRIPTION="Web-based storage application where all your data is under your own control"
-HOMEPAGE="https://owncloud.org"
-SRC_URI="https://download.owncloud.org/community/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+curl mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND=">=dev-lang/php-7.0[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,xmlreader,xmlwriter,zip]
- virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
- webapp_pkg_setup
-}
-
-src_install() {
- webapp_src_preinst
-
- insinto "${MY_HTDOCSDIR}"
- doins -r .
- dodir "${MY_HTDOCSDIR}"/data
-
- webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
- webapp_serverowned -R "${MY_HTDOCSDIR}"/data
- webapp_serverowned -R "${MY_HTDOCSDIR}"/config
- webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
- webapp_src_install
-}
-
-pkg_postinst() {
- elog "Additional applications (calendar, ...) are no longer provided by default."
- elog "You can install them after login via the applications management page"
- elog "(check the recommended tab). No application data is lost."
- webapp_pkg_postinst
-}
diff --git a/www-apps/roundup/Manifest b/www-apps/roundup/Manifest
index 7c27441c8c7b..92f32fb838da 100644
--- a/www-apps/roundup/Manifest
+++ b/www-apps/roundup/Manifest
@@ -1,6 +1,6 @@
AUX roundup-2.0.0-test-pyjwt.patch 4712 BLAKE2B e1b8dcd070feec087f5d00eb8f71d5eaa389d543d03b671d327a9e3b23458aa97cf5681fc62be128b852a305e71efae27f12277aba61ac8ffc6d4ba2dbd23f8b SHA512 0d8d34f79b55fe48b5df9b6f1894eda22d68e0faf53b1b1ece5d7904ba98a761b4f28d9bed1e28be2342341b144d72182097d0afc9cc9884923e106b06c34e72
DIST roundup-2.0.0.tar.gz 3495554 BLAKE2B 98b7cbfebe969411282ddf6b4bd7b94ea1efb7b1d929daf44ae5f30dc23c05cb327d0f4653b22a5594f7b198dd16a172c45568a15f8704b187cd4c355455ca9c SHA512 5adb0d96be260e70fe098fd37af27bd0abee38cb8fde4ba2e130d2caac7f64af86a3b0ab09de931a693dca8bfbe15c68444db343ccf718d9d25576d49c6d6cbf
DIST roundup-2.1.0.tar.gz 3586805 BLAKE2B a5ec6cad38e252e2ffd4d3de4def9b8414ee8758503aa29681d80b36ac62a15700e21e762c6833ce6f795f71a7a1c75c4d9ae30c49c5f038317e5d3fdc58b11d SHA512 ebc047d944f1118b30141b873d91e580d415f1e7c9331875d6efb18cf42c9121163c801b1559d02890165bfd2e5a894c5990b587ce7766b2bf4724745ca9e760
-EBUILD roundup-2.0.0.ebuild 1540 BLAKE2B cf9276051d7f42fef36f49059e890b3c4e2130291a84732e7ca4e010f500711d362ce0b12eae0c2d524eb0a5247109e6e993c309a11cb06649d3cd1ab448c4db SHA512 7b936c7a0d980af15c3306ef3ca698219535822e61289c57c04382bdff287145866e814f3dbc8a785dfcd4a6c952ec4f1841c938623add1b877977adc5da0a73
-EBUILD roundup-2.1.0.ebuild 1478 BLAKE2B 07043b52c22d0d1698bfb9266c8913414eeb108ce0aaa75efe33ba5f4ec441209acb83ff319625fa628416297d2fe1e117032b640996b4b19acacab7b2217ee1 SHA512 afef6cb8d46400930af20750f024ae7554579c5a846a632ee345a16b3c7d863f956f2a4be405eecb4ed05d4024a3ea4a63f3c63f2ac2e560568d0b2fe0495b7d
+EBUILD roundup-2.0.0-r1.ebuild 1542 BLAKE2B 464b592944fd9b436fc16aab9453190cdd02cb27aaccffa894642022165bb6bd42cb444db6f54b6270f76d5cf0cf7c0252f04a608e58cfc2d2b861f674099a47 SHA512 0d57f382e068fe07994bc669ebe6d244a9b01bd78266a4b0a21072a8eb22798fd01b361a4922a5561c7dc6416a0f2032a31bd98c0cdec5bee9b5bd959fa3bd86
+EBUILD roundup-2.1.0-r1.ebuild 1480 BLAKE2B 1bd1729224a37a2c1a84d4d0d4312744a39c7f0eba2e77c456edf99ac12704c27cdf68de6160371a245624d36e64d2b710cb133d781f546ca6baaf812f22a148 SHA512 14b75665efa5a1b987aa24013a9081a2b4c3b03a7c97bbdb33d73567a1bdc465ea89b237d7b38255adf565c6c4a358676cbd02bf114fb68c81422b02c95e391a
MISC metadata.xml 859 BLAKE2B 4ed7bcbc75c9efb585273835f8d50f933e79e6d67c982e596aa320fa87b533136eb8040ff3df94ac4ee045bb6dab8aad5c8bfd0c5df764425a2c43b015753f6b SHA512 3ec9884582ea8ad43a9210519c069ef87e1e2ae55b4f2d11c3f97de8add7b3df1ec31b0651aa96163564159febe58b6dc174b94782c6a618d090d67b7530547e
diff --git a/www-apps/roundup/roundup-2.0.0.ebuild b/www-apps/roundup/roundup-2.0.0-r1.ebuild
index f2b8f1e25bb8..7a5a687eb89b 100644
--- a/www-apps/roundup/roundup-2.0.0.ebuild
+++ b/www-apps/roundup/roundup-2.0.0-r1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
DISTUTILS_USE_SETUPTOOLS=no
inherit distutils-r1
@@ -23,7 +23,7 @@ RDEPEND="${DEPEND}
tz? ( dev-python/pytz[$PYTHON_USEDEP] )
sqlite? ( $(python_gen_impl_dep sqlite) )
mysql? ( dev-python/mysqlclient[$PYTHON_USEDEP] )
- postgres? ( >=dev-python/psycopg-2.8[$PYTHON_USEDEP] )
+ postgres? ( >=dev-python/psycopg-2.8:2[$PYTHON_USEDEP] )
xapian? ( >=dev-libs/xapian-bindings-1.0.0[python,$PYTHON_USEDEP] )
whoosh? ( >=dev-python/whoosh-2.5.7[$PYTHON_USEDEP] )
ssl? ( dev-python/pyopenssl[$PYTHON_USEDEP] )
diff --git a/www-apps/roundup/roundup-2.1.0.ebuild b/www-apps/roundup/roundup-2.1.0-r1.ebuild
index 4fce988711fc..46b7a8361e12 100644
--- a/www-apps/roundup/roundup-2.1.0.ebuild
+++ b/www-apps/roundup/roundup-2.1.0-r1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
inherit distutils-r1
MY_P=${P/_/}
@@ -22,7 +22,7 @@ RDEPEND="${DEPEND}
tz? ( dev-python/pytz[$PYTHON_USEDEP] )
sqlite? ( $(python_gen_impl_dep sqlite) )
mysql? ( dev-python/mysqlclient[$PYTHON_USEDEP] )
- postgres? ( >=dev-python/psycopg-2.8[$PYTHON_USEDEP] )
+ postgres? ( >=dev-python/psycopg-2.8:2[$PYTHON_USEDEP] )
xapian? ( >=dev-libs/xapian-bindings-1.0.0[python,$PYTHON_USEDEP] )
whoosh? ( >=dev-python/whoosh-2.5.7[$PYTHON_USEDEP] )
ssl? ( dev-python/pyopenssl[$PYTHON_USEDEP] )
diff --git a/www-apps/rt/Manifest b/www-apps/rt/Manifest
index 0c50fe3aa224..55155aa380f3 100644
--- a/www-apps/rt/Manifest
+++ b/www-apps/rt/Manifest
@@ -3,5 +3,5 @@ AUX postinstall-en.txt 620 BLAKE2B a57e1a705fa31a2c5abb080be8e9ddea41017132c5142
AUX reconfig 2133 BLAKE2B fb5fdf3d68c1ff06b0e1becd25594b4544515aea3399ef2a563cbc541aa8ccf18f0781cbd08f97504bba0980010a7756a657c5ca0d7caa227cebf15b0d0f3231 SHA512 bfeedd02918240fb1b79fe9a5f62b6bda85e3f9df2c55dd9a93deb490495bb269579a999a71bd135fe43f247774039e34947c39689461ef4083b482f02fa3c56
AUX rt-makefile-serialize-install-prereqs.patch 596 BLAKE2B 65427cbc4425fe47bd4ee5a624df45f802ff1153fa778493a619120db0ce5082876e05d802c411e2cbeb6293fa7899e374c462f7e2c83225a8d423baec162316 SHA512 0ae2ad3ac5faf7ecc65545cfbba210034a2f532c4b1fa82b37956731b35d7e42e3d3ca4714834f2797ecec7292f19dca0be295ad92ed3931374d07af02ed10a1
DIST rt-4.4.4.tar.gz 9977845 BLAKE2B bc27a68c880d305e43069887bd4c2dbf09e82413ee9b7f1e0e19252ad5249430f17bd980c94a4c74386a8c7fefc79af50a0e572adbb0ef707e46a4be63e8d3e4 SHA512 95335cfa9e7107300670a5e8631ffb6f402895dae051201d051ac01885b0cb185f838a666acaec773e0f670e1b9d16b7cede72f37ce9832fd83a9da8514e6972
-EBUILD rt-4.4.4-r1.ebuild 7826 BLAKE2B 738272f75855198cf883b9ef59d14ffd4fde6963b92f22921fa4d2669e8d4d1191e1150c4d7e21340d99b09ee56c6ad671cb53b78549edaaced0f09bf4dc53d4 SHA512 34b3ca8876195de30b2525d0f1a1000d834a5ae2366779c40fc1257c39b9b05c3e06d8f04c324efddce1f565e97f656a11f5f8830be8ca52b6b98eeb71be079c
+EBUILD rt-4.4.4-r2.ebuild 6767 BLAKE2B bf6da2f65b83d06f7abed1f33759b5abb81bcd552b32d41327f9e3f699b71731db751395e54b2dfc2d11bd0bbea73b72187e214758372caf109c4ab2afb300fe SHA512 faad290fe8aebb417faf35eb543c6e2bacc06c610e0befc38be9ddbdd4ca10a584c63f6e9eccc045ec29101853f30603dc1549487919d745ec1c6ab57780ea69
MISC metadata.xml 455 BLAKE2B 6664934a9bce66ae07c6b3b0c57a7ea118f0a0d0c582d4a5323765ffc185e2735afb85c359e1041f25f1d73be41cd279e460196c6c05cde4ca4df094ff6107e3 SHA512 31a8433cff9f603152dfe31356e0645872e91c08027e52d58919b16ed346d1707de442ef6eea52f1a06052cd6ba9001a64fd258b8d98f0df2e5943b91f58a704
diff --git a/www-apps/rt/rt-4.4.4-r1.ebuild b/www-apps/rt/rt-4.4.4-r2.ebuild
index 8f0b49e9cc7a..efcf278b94c6 100644
--- a/www-apps/rt/rt-4.4.4-r1.ebuild
+++ b/www-apps/rt/rt-4.4.4-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit webapp depend.apache user
+inherit webapp depend.apache
DESCRIPTION="RT is an enterprise-grade ticketing system"
HOMEPAGE="https://www.bestpractical.com/rt/"
@@ -17,8 +17,9 @@ REQUIRED_USE="^^ ( mysql postgres )"
RESTRICT="test"
DEPEND="
+ acct-group/rt
+ acct-user/rt
>=dev-lang/perl-5.10.1
-
>=dev-perl/Apache-Session-1.53
>=dev-perl/CGI-4
>=dev-perl/CSS-Squish-0.06
@@ -141,46 +142,6 @@ RDEPEND="${DEPEND}
need_httpd_cgi
-add_user_rt() {
- # add new user
- # suexec2 requires uid >= 1000; enewuser is of no help here
- # From: Mike Frysinger <vapier@gentoo.org>
- # Date: Fri, 17 Jun 2005 08:41:44 -0400
- # i'd pick a 5 digit # if i were you
-
- local euser="rt"
-
- # first check if username rt exists
- if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
- # check uid
- rt_uid=$(egetent passwd "${euser}" | cut -d: -f3)
- if $(expr ${rt_uid} '<' 1000 > /dev/null); then
- ewarn "uid of user rt is less than 1000. suexec2 will not work."
- ewarn "If you want to use FastCGI, please delete the user 'rt'"
- ewarn "from your system and re-emerge www-apps/rt"
- fi
- return 0 # all is well
- fi
-
- # add user
- # stolen from enewuser
- local pwrange euid
-
- pwrange=$(seq 10001 11001)
- for euid in ${pwrange} ; do
- [[ -z $(egetent passwd ${euid}) ]] && break
- done
- if [[ ${euid} == "11001" ]]; then
- # she gets around, doesn't she?
- die "No available uid's found"
- fi
-
- elog " - Userid: ${euid}"
-
- enewuser rt ${euid} -1 /dev/null rt
- return 0
-}
-
pkg_setup() {
webapp_pkg_setup
@@ -189,16 +150,13 @@ pkg_setup() {
ewarn "make sure to read the related upgrade documentation in"
ewarn "${ROOT}usr/share/doc/${PF}."
ewarn
-
- enewgroup rt
- add_user_rt || die "Could not add user"
}
src_prepare() {
# add Gentoo-specific layout
cat "${FILESDIR}"/config.layout-gentoo >> config.layout
- sed -e "s|PREFIX|${ED}/${MY_HOSTROOTDIR}/${PF}|g" \
- -e "s|HTMLDIR|${ED}/${MY_HTDOCSDIR}|g" \
+ sed -e "s|PREFIX|${EPREFIX}/${MY_HOSTROOTDIR}/${PF}|g" \
+ -e "s|HTMLDIR|${EPREFIX}/${MY_HTDOCSDIR}|g" \
-e 's|/\+|/|g' \
-i ./config.layout || die 'config sed failed'
diff --git a/www-apps/tt-rss/Manifest b/www-apps/tt-rss/Manifest
index fbc3e67b9723..c59fcaa3b3b1 100644
--- a/www-apps/tt-rss/Manifest
+++ b/www-apps/tt-rss/Manifest
@@ -1,11 +1,12 @@
AUX permissions-r1 1189 BLAKE2B 5411939128bac5718d47b91b1f189805e675ecc7142ef47750863dc8c4f2654c48cb7fbbb65457ee0074de1e293faffb71d97672cb04ef5113bfad31c0309558 SHA512 7ffade42d37d6c400c3df10f47165a6f83602182dde82da420ad61244f8db3a22675120d52877e892a959e911307bee759caa843aed25496a244e883fabaa8e3
AUX postinstall-en-with-daemon-r1.txt 586 BLAKE2B 8a8c24cb93373af40ca662bc5453bbf3f2628ba0e39f0053405010e9c91e032167a7da9feb335782a679af1efee004bd134694fb655a5992cc3b1f8d3712b8db SHA512 e57ae761499454ce26c5bf58b7faa1cdfa05a7409bc4fc2b2ade16097a8131e279ffb09be2d5b39e80a17fd1c9533e795c6908548097f318106f1c7cac00e65d
AUX postinstall-en.txt 102 BLAKE2B e4edc2c0a482cb8ba822b902e553680626081336abe42421380404c179324c2243eb07c4934ff70ce07b0c9c4777af14c803e1adf08768ea76c1660612e111d3 SHA512 2b1a6e9faf17b36e7011b488cde989d890fa23e87d5f88aa91a1d9597bb55400db74e413742c9d15acbc745a25f23b1533ad6fdb829d04dc21ff5898c7d98ccf
+AUX tt-rss-no-chmod-r2.patch 930 BLAKE2B 57d63f4b27a8ef80553ae5fbca66726db2acd73a1bb9eeb34eace5f37e437a48b9f50b2576fcc8b0be80215c866b236c57b605a0ce226d10a9e40a9eb1eb8ddc SHA512 cd537f7a01de02fc000b5ddf34bafe4832353fd87b8677dd86a6e4bcee3b1f5f747c42cf966b97d095b5a3beed2213cd7b4211be003cb6942b8fcb2f1f937d8a
AUX tt-rss-no-chmod.patch 934 BLAKE2B ef6c7a85ded012b3d9b2369b19ff657dc8b3954b2c94d30b47c42ca83d660b98f753ece525156beb544ed1d0660162e06a07c1e2bef963543bac7eee15cc676c SHA512 659c00f349aecc994d7b95c721e85f5ffca12b56ea81fefed5dc675d33a2a8d6fb3968891065b2f73b52d21e736ea8e95163062103ecf15cd448a0797cf37807
AUX ttrssd.confd-r2 1581 BLAKE2B ce18840ddb58704abb9311d02e27cfc179bba43668b90cb358082466d55bb54acdb5806f73cb24dbc758981c477eeb6a50c472043323abaf50572f7d2eeee4b1 SHA512 15957854718a4decf7ac9784e955fc090755343008facd3d65d7e72f3e00df170215514a5435378180110c6f4584df9e5580eb45775816eb3f5c58d09e03d249
AUX ttrssd.initd-r4 2863 BLAKE2B 28a0b410b8425bcf4c9abc5197ff777b06347c1cdefa021b9f8fb32d256b9ca72e0c175ac412b3aa41e7f75e30446741b7f6445d1293b1a59c19e3eba2ec52e6 SHA512 8ff7a6b2f1cb38baa0c13fa7c7f5ee1b54bf2ff2111ad62649d36cf3b12e5b82f9ef3eb6b6c904daa8565a7d2cd817daaba322f4aa03b5f3c5ffdefced730f82
AUX ttrssd.logrotated-r1 135 BLAKE2B dc653add518cd3ed5296097d51ca2346e102edcbad5ec82397713ded489e8ed8e49af928331e58b80152f13bddc37d673c67440df388651c875cfbd37ff62080 SHA512 c292020a55688c6edb4306d9d8144ad7d30be94fda08467b8bbe560c7bf02b0877d9591123a226dd030e9a9c01b79df4a3696e54fd1ece0dbdef1c285cdae97a
DIST tt-rss-20220218.tar.gz 9916433 BLAKE2B 318969b6e5156842079bf68c4ea614e5e60e21d8caa46b1a78f2cef051904da30e5091838f6e10f6f610d8ee39c7922137aeb60b7cd5004cabc1d2cdf65edfa8 SHA512 38a81dd737462724bc52ca3915350c175abe548cd566a4f9a5e1d5efda9287d0666e9348e5b13dd20549360501de5b0bfb659292fb650f7a60fdab8b63cf8202
EBUILD tt-rss-20220218.ebuild 1927 BLAKE2B f533ff2137699ee6696856cbaadbb0773eea148f45c13e8c7736d2212078171c8629f17c53e0701ddc6b27d69328a7e634854a9e6b8e5c9097be6bd0bf9b2481 SHA512 9edac5cb8ffc212c74f35aa0f16289dafd4c88ba3de7bcb75113c5f8e5e4fae1603de3c087cf3cba3bc8599dd7797ae3838403f76ce851e453b05a47fdb1a803
-EBUILD tt-rss-99999999.ebuild 2092 BLAKE2B e784b3bd22094b2584e2a799b220a80a97680cdb3b3f3f80a2fef49b7ea91ec0a9df3fd172c411abe5f9999b3df410fcd16f72d091c63ab229344fb905d77ebd SHA512 b1bb0ace278597ec63cb05f7a2c649d2d85115bc78a910930d8a88185ddd288a08a50e7f83dea153866409c54ec89ed81523011b75fceda4c7e7f9b4ec9fe4df
+EBUILD tt-rss-99999999.ebuild 2095 BLAKE2B 48eba6ada7e044849ab98970716aa3811d663df9f2c4d19b183e5ca08c763f4db83ed6585c8b7412848f227e2f93c6ed6fb2ccf64da03694cda49bca54ca0d19 SHA512 3e4397360072b66119aa09fa1f8f6762cdac3a29409b89c16a086dbc1dbc9c1490c80b862e112995e2f8cf1975fa2ad05fd40d17404f26bc84d7a421ff9d5e98
MISC metadata.xml 374 BLAKE2B 659dd027265141ba90d4bf8abe45e12ed5187c866605f939f26fd4b55911870c8cca907c96f4bae2f84cb43c1691a6eb79eabe671e4b3de0c34d9befb6ed4c46 SHA512 ab38e1e98bb90c292576830d65ad6871dc6feab2a93d7cc9a580f1333e6c7859cb215ef44952b3e9018b431ca0c4c7f61fd0ee6d2daa86bde971ab2e113ba0bc
diff --git a/www-apps/tt-rss/files/tt-rss-no-chmod-r2.patch b/www-apps/tt-rss/files/tt-rss-no-chmod-r2.patch
new file mode 100644
index 000000000000..05de80b127c5
--- /dev/null
+++ b/www-apps/tt-rss/files/tt-rss-no-chmod-r2.patch
@@ -0,0 +1,26 @@
+These files may be written and then updated by the web interface user or the
+update daemon user, so they need to be group writeable. We enforce this with
+ACLs rather than chmod though.
+
+diff -Naur a/classes/pref/feeds.php b/classes/pref/feeds.php
+--- a/classes/pref/feeds.php 2022-02-18 13:44:03.000000000 +0000
++++ b/classes/pref/feeds.php 2022-02-19 15:37:55.000723992 +0000
+@@ -490,7 +490,6 @@
+
+ if (file_exists($new_filename)) unlink($new_filename);
+ if (rename($tmp_file, $new_filename)) {
+- chmod($new_filename, 0644);
+
+ $feed->set([
+ 'favicon_avg_color' => null,
+diff -Naur a/classes/rssutils.php b/classes/rssutils.php
+--- a/classes/rssutils.php 2022-06-20 09:37:43.205998915 +0000
++++ b/classes/rssutils.php 2022-06-20 09:38:01.002279039 +0000
+@@ -1758,7 +1758,6 @@
+
+ fwrite($fp, $contents);
+ fclose($fp);
+- chmod($icon_file, 0644);
+ clearstatcache();
+
+ return $icon_file;
diff --git a/www-apps/tt-rss/tt-rss-99999999.ebuild b/www-apps/tt-rss/tt-rss-99999999.ebuild
index e91fad7a3c67..89e1ba0ce816 100644
--- a/www-apps/tt-rss/tt-rss-99999999.ebuild
+++ b/www-apps/tt-rss/tt-rss-99999999.ebuild
@@ -51,7 +51,7 @@ DEPEND="
need_httpd_cgi # From webapp.eclass
PATCHES=(
- "${FILESDIR}"/${PN}-no-chmod.patch
+ "${FILESDIR}"/${PN}-no-chmod-r2.patch
)
src_install() {
diff --git a/www-apps/wordpress/Manifest b/www-apps/wordpress/Manifest
index 953e15bca203..76259bf56dc7 100644
--- a/www-apps/wordpress/Manifest
+++ b/www-apps/wordpress/Manifest
@@ -1,5 +1,5 @@
AUX postinstall-en.txt 1285 BLAKE2B 09a372660022bda4064f2b298e6409be4d8f8943fd06d672e15c6126029acf2551b2eb0447f378a7c9287f757a820787ab6e592556e5cf199b0d8c0dd8f98f18 SHA512 8fa41aa39a1dfead723c87e6b16f979839dd5c585b9f9bb14a8a1ef556b69f9dcab113622b56c24890d1414df045b055b6997be02364ab4d5c7c06db2e4c12b2
AUX postupgrade-en.txt 963 BLAKE2B c08e2ecca3d462d544549c80fb11abde670251002257d75fa8dd41d890f1327b08f1796c54125663fd35aca999f63b89035b610bdeedc32396c35d9d9b92ce4d SHA512 dbc86a1cf3b5280137322794a344818be8cfc137153f0e634e7bbd856ccb7ac589199353f2ccd5c28a8aa7d35cc2e041137bfc5d812fc6267efc758a1113c2d4
-DIST wordpress-5.9.3.tar.gz 18725197 BLAKE2B f771aece0f04eb22228488f59a24273ae9c38b7af0b653e996ef0b141b3030864928a3a7d7a91c6e2bc6bc5d2061f4336b6271cdd65217010ea99360baf1ce6e SHA512 9d44d95c6f046558783c7de22cbe7eb912e21234b549b324ec43ab6013ba3f4990a3478e40c8cf399dbbdf00598dcf30423f9d1f74da83e63ee920de457b6637
-EBUILD wordpress-5.9.3.ebuild 1368 BLAKE2B 68aa2c644a238675b3b6b7c1f04cfa44afd113e71f52b925543923c73dc0671bed50c7e1580fa75c7a677ac709e173f0ea265c47f5dc9e9af08e65aed8cf30ca SHA512 28abf3d321a795c5cc9f6ce51eb7f3b8571c9890f7c04ed062263d022188d8c8cf4a808b2c398aaf1bcf67746e9046f41da701a8ef23e5550cdce2811782a81d
+DIST wordpress-6.0.tar.gz 21166276 BLAKE2B 37a4033d7d6096e029850ea7d061aba387d7100599833924a86281fa87bd31b640f3a1d20f55da8b67deecf211aa99a6cb90c3ec5602042e93a0bd55ccf0d7d3 SHA512 5449129b21cb3c5093c73b7f712e91c05db27f60d3797b0697c3dd2929b6996b2ebf41a0e827b72a110625654acd2e336a73f76fba144d30e56586ac3ba2ca34
+EBUILD wordpress-6.0.ebuild 1368 BLAKE2B 68aa2c644a238675b3b6b7c1f04cfa44afd113e71f52b925543923c73dc0671bed50c7e1580fa75c7a677ac709e173f0ea265c47f5dc9e9af08e65aed8cf30ca SHA512 28abf3d321a795c5cc9f6ce51eb7f3b8571c9890f7c04ed062263d022188d8c8cf4a808b2c398aaf1bcf67746e9046f41da701a8ef23e5550cdce2811782a81d
MISC metadata.xml 429 BLAKE2B ece54e1ebae950843d98b414ca862ebcbf410230587eab84031e4afa00a9e6f0305b025a79fd5f8ce3cb70b2528adb8c5eee05e6855f0b2f55aa4680fd9a4b83 SHA512 acc7151db82ee83a7ad9b6eff62918afdc44436cd18aa4f5fe0b562257ed34ac7ca28582cfb5196b1049cb9e0db0a94c51faa8cd7c3bb081a5a0a2333391388c
diff --git a/www-apps/wordpress/wordpress-5.9.3.ebuild b/www-apps/wordpress/wordpress-6.0.ebuild
index 6ea3e4bf16ad..6ea3e4bf16ad 100644
--- a/www-apps/wordpress/wordpress-5.9.3.ebuild
+++ b/www-apps/wordpress/wordpress-6.0.ebuild
diff --git a/www-apps/xpra-html5/Manifest b/www-apps/xpra-html5/Manifest
index e2472a5b0956..4af1e1bb1669 100644
--- a/www-apps/xpra-html5/Manifest
+++ b/www-apps/xpra-html5/Manifest
@@ -1,3 +1,3 @@
-DIST xpra-html5-4.5.2.tar.gz 1492651 BLAKE2B 1e0fb2f554f4e2c4bb4bbf3b937b33408dc56b7a2aaba1a0459e28bea4c87b5f96195abbd2de0e8461964e43dace5f40badfdb9dfe3a4db5f7c3c9eddc6eaa68 SHA512 a1f73889ad3797ca25d232d3d11e1753dc10944cb8f07c1d6dbacfbf5273b22a0d3696af4e88cd5b75ed4a0970533e340a41253842c3766ab6fe650dc5fb0d0b
-EBUILD xpra-html5-4.5.2.ebuild 1078 BLAKE2B 20d2f20b884433d1832d722f2b114e8562d155942301697cc0f8cd78ce68864f50598d93414e735f5cf8b0be8f8bb8a1630272424a12ec52232e210aacee7c81 SHA512 0eff2e4428c78b68d93a2082c677ed67243e1442bbf1a5b5b6c4cd38550966d7785b7a4c644e0381464a028f3a432f327fd28413b5036822ecea84571c484989
+DIST xpra-html5-5.0.tar.gz 1570694 BLAKE2B aef7b818aa618c143701993627e629884b5e696c7334e6b75701a20028f18aced5e3249505ac031d6cd0a08d79ca2b9728afdb2e90712fcbe45d43d02598f608 SHA512 8318c6dd8f8f53d0a132272c2bb8c69e8ba928f2f267679aee48cec4598faa828788a219dfa342162e1fcf8159bf46b44d50db57180f1aa972edd67fa43e9cd5
+EBUILD xpra-html5-5.0.ebuild 951 BLAKE2B bc8b0a78200e8d3effbf17ec7a0e32e011f8f5f924ab006f841c5cb1227878f9c8cb7c87fbfd1b28a83d765e938551d948fe05287f2db1fe83a5a51a34f9449f SHA512 f06d8e7491149ab63a3ef5a43cb88072ef59e583a283397e7b1a9bbbdb03914b7bafc10bbd01da05d6d167cbacd6f89310da570acb37083028cb2f4912dad8ea
MISC metadata.xml 551 BLAKE2B 6d62f17a775361ec0b066cb994bc5a6ccc841e61991aa44a72512e82ac94c6a66ad7fbf3998c784cf830cfe44f03e496edd9b491e95f173fea71f328349bd457 SHA512 d839ba317b8d58e5849de92243408096799b1328baa3d46e0ca06e4c038639a35566a9a636f7da491820bc0e3af0cbd5e18043bf815b873f3ead4d68ff54c960
diff --git a/www-apps/xpra-html5/xpra-html5-4.5.2.ebuild b/www-apps/xpra-html5/xpra-html5-5.0.ebuild
index 43135d172c20..5c2270895f63 100644
--- a/www-apps/xpra-html5/xpra-html5-4.5.2.ebuild
+++ b/www-apps/xpra-html5/xpra-html5-5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -34,15 +34,12 @@ src_install() {
import setup
setup.set_version("${PV}")
setup.install_html5(
- "${ED}/usr/share/xpra/www",
- "$(usex minify uglifyjs copy)",
+ root="${D}",
+ install_dir="${EPREFIX}/usr/share/xpra/www/",
+ config_dir="${EPREFIX}/etc/xpra/html5-client",
+ minifier="$(usex minify uglifyjs copy)",
gzip=$(usex gzip True False),
brotli=$(usex brotli True False),
- configuration_files=["default-settings.txt"]
)
EOF
-
- insinto /etc/xpra/html5-client
- doins html5/default-settings.txt
- dosym ../../../../etc/xpra/html5-client/default-settings.txt /usr/share/xpra/www/default-settings.txt
}