10 files changed, 9 insertions, 279 deletions
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index f63e40aef8a8..383243a60263 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index 8ea044c2c047..1ac2d5aaf26b 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -1,12 +1,12 @@
 AUX grafana.confd 162 BLAKE2B f5567427be3510fd7c79eefe06fe4050c7e350eaa9e82c3e871a86738f21b8b3ee68caf1e2b437343f739564dac5ef91db5dcb6b2f31b49a936f9d4e6a62cca4 SHA512 13b9868a4c0a5a7209e6f4aa1206a93a0fb33b0234c4c0a6942bdab9d1cf139049181c066e01c49f639165ea422259fa7cab9e0bdf21537b3722bd86691d9b2c
 AUX grafana.initd.3 972 BLAKE2B 077e7cf023b83b152c762f63c937435823053909e26d6743e94fc59f76ef77220610d2fd02950ad0157b9ebbfd8380a489cd0da33b5b25102fbaa936c1212e2f SHA512 fbad0e00b1b47d9eba808d2ed84e3208d2279f1deeaad71710c6756ad120b1f9f1bb2ba1c5f9677ed3a5efe28df8437c48f5c68b5e8eabb1e91b14e762c1e442
 AUX grafana.service 676 BLAKE2B 98b7e216324a451f97b9b0c2d1bbe493ea3206b8a6113f34f1064f8fde3c931c32913d4b94d77722eefe709434c3f5692b58a840066ae017f5b5f9dfd18ba9a9 SHA512 2355f708b8b5f520efa0d18c81a5e817c29953373b689b8fdd7c3f722f9b4d566d2e8329434daf2268d24fb2ff563b80ad84b144855a67abcf96c2b7b910b31c
-DIST grafana-bin-6.3.5.tar.gz 58756804 BLAKE2B ffa96e5fd067dbe3590c8102c8ac93337679d968c19ec0decf44a39118d4473da82ac2f6702400cc57c22ea7703af3e7cd39aad9a1c63f41c5613b3d5bbe2bed SHA512 0298894f845fa6e322f3fa51364ba24617f3847c2f597a336ba3c1e761165a11efb9a884c3cce8856281bcb8ea3b66341c5ba301f58ce6bf2a8d0328ecd774bd
 DIST grafana-bin-6.3.6.tar.gz 58756037 BLAKE2B cdc7aaf9fe33ac271ca3a942e4dd9d33e8f6125db239a6b83ae33232730c44a8aa6395ebeaf60ed1d862912ba84c36347481c78d89150b32ae325926145037a5 SHA512 2c230c510a7e480aa9d972fc6648a4748fb5587830078a86b7a228f6abd1e8f4b1eb20f5ffb5d166ce07b43ac602e01af6c0574e3f8b276dde856ae6ac437067
 DIST grafana-bin-6.4.3.tar.gz 59643330 BLAKE2B 721a32cb8b6a876fab8d1f9fd2d8ef0b5ffb142c9b35cf7d854a8f740c74a295eab84eb84a7404edcd7f2cb0e2a830f5cf701ad52b1d771c74623dabcb5dd4de SHA512 fdad6394fd050094a878da77a349b1c35320214b5ff522fe106a97bfd4e03267e4638e395fe19d69bcf1c5b6ba924907661d9549692a02a0463c641253dab6aa
 DIST grafana-bin-6.4.4.tar.gz 59693249 BLAKE2B 9a4a408e938475cee0154b3b49a2e6a10eec76effc2fda428c64449b74ce2ed3e939ce9ee35ff5aa21580e4b8b2410a199157107ef62852445df72536050390f SHA512 096abffb6a31ea9cfcbf3732f61b007a5cf0da77b681ebbad6d1b844d9a80fba725f18732cfba713b5b559eac748790dd1302088e51a917d141d1dd5dca6b5a9
-EBUILD grafana-bin-6.3.5.ebuild 1968 BLAKE2B fcc4feffc504f8060f41d50cf96e8080d421089e851d7e89d98cc166abce23ec21347c97ef8b693629664789584c67df82591a0d8e76acf12f86b33185ba9d32 SHA512 fc4e1c85e3346831ef9377e41ca3ab8636809a5ca4ce330fda39c739f5e184ee3c55bf0813ac60816ca980a71e093b9b78464b1c5210debac0aa76d953bdde9d
+DIST grafana-bin-6.5.3.tar.gz 61041681 BLAKE2B 624abf5fa31271eb81182bd36377eef0e643a4fda2c6ecc00545d941318ecf4b526fa4753ab6e3cc820fb22b1bf3768cdec946fd13483ef7137f1672aa7b63b6 SHA512 4f672c0fc4a74fff904bd3b297e40c06c616157bb9d3e2783950339d20c551f580dea7a59fb0ff58480010047d34088c51c3ec3175039b9510acb0a18ef52546
 EBUILD grafana-bin-6.3.6.ebuild 1969 BLAKE2B e90820bbe240031ddf9556073f2b1947730d4d6b667257a0015b61db350f3b78b74f416c9b47cd272296e6fef023945f15e896680f809e661b3a6adc59795297 SHA512 1d7ced95a186b315fbda5dd7bd2a1ccb45daa5a4706fe36d7f35853747fc51350ffaaa199a326bc6998e7299bb9104319fc58ae606d0429ce0c4147581e6ce2a
 EBUILD grafana-bin-6.4.3.ebuild 1969 BLAKE2B e90820bbe240031ddf9556073f2b1947730d4d6b667257a0015b61db350f3b78b74f416c9b47cd272296e6fef023945f15e896680f809e661b3a6adc59795297 SHA512 1d7ced95a186b315fbda5dd7bd2a1ccb45daa5a4706fe36d7f35853747fc51350ffaaa199a326bc6998e7299bb9104319fc58ae606d0429ce0c4147581e6ce2a
 EBUILD grafana-bin-6.4.4.ebuild 1969 BLAKE2B e90820bbe240031ddf9556073f2b1947730d4d6b667257a0015b61db350f3b78b74f416c9b47cd272296e6fef023945f15e896680f809e661b3a6adc59795297 SHA512 1d7ced95a186b315fbda5dd7bd2a1ccb45daa5a4706fe36d7f35853747fc51350ffaaa199a326bc6998e7299bb9104319fc58ae606d0429ce0c4147581e6ce2a
+EBUILD grafana-bin-6.5.3.ebuild 1969 BLAKE2B b871590d26c2be2d591be5a35c4b06ed5f3a820315f9661bbe1da3fe4f6c369987b7a51afc73456fcd10c08e26aee07bd5116b69075add4ddb07bb76a9f289a3 SHA512 c7091e34535a4fbedda19751d7a8ce7497ba6c00a5957d85130c6eed881d57a2d40ff0188aa3b632c1c42ac9b6ba9ebe6a9a073f2be6c4f20c401c4e5c592f2e
 MISC metadata.xml 218 BLAKE2B 2189d142b4baed0b8edb49fcc98f7397610a257a4cb5f87873272b284f84290420f0950c8b41d1d050ca7a1e0486c6e00344672a3f0479d1d382c14bf7f18485 SHA512 882f7787b97aa780dd3ba4112b9e1dcc84986e2a17704cba9a557ec3a3f9211bcf93532b92d42f60157b56b457ee9ee17e5409066230e54d48931b91bd6786cd
diff --git a/www-apps/grafana-bin/grafana-bin-6.3.5.ebuild b/www-apps/grafana-bin/grafana-bin-6.5.3.ebuild
index 660a3ccaf0c9..58b22b14471e 100644
--- a/www-apps/grafana-bin/grafana-bin-6.3.5.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-6.5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://dl.grafana.com/oss/release/grafana-${PV}.linux-amd64.tar.gz ->
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 
 DEPEND=""
 RDEPEND="${DEPEND}
diff --git a/www-apps/mediawiki/Manifest b/www-apps/mediawiki/Manifest
index 49f049a27e0a..3bea8a794844 100644
--- a/www-apps/mediawiki/Manifest
+++ b/www-apps/mediawiki/Manifest
@@ -1,9 +1,5 @@
 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.33.1.tar.gz 37863816 BLAKE2B 2f4ce62c3b46738d31af9fcfde61a9521a0bb838c035ef539f4263e61b7fe5db59597a3142a6f942fabaad1bb97c7058a21df654588e6a60023fa5fad5e4d88d SHA512 0cf786872714546fb13843bc5f8b851bfcc665f7459a0326a3fb77efb0d1976b618d4e2206d3fb0852a60b7fa375e98aa0b5600b03209ce9eabd9e3dc5db7d1a
-DIST mediawiki-1.33.2.tar.gz 37866372 BLAKE2B 1aac64cccf17bf8a890e40cdef85c209fc489e812ba8c8f158f9d9a7d50c5389c40f5ff251ea9a76620cf4d88e0e21942b5be52a60d0f3c682a365ea50078c01 SHA512 bdbdd508360ab84a611dc1c57b1504fa5591d08ac24c511430bdb802999f8c7f7e323f1a9a2dd7a405291889f4bff8ca7a8b8911bfed0bd460444bfae52b271c
 DIST mediawiki-1.34.0.tar.gz 40344724 BLAKE2B 899620db50337aeb6189dbf33ba54e06aae68923c43022f6590e46380907e884d9ab606b69cef5087e1b2f273a2fa962883f4e6524682db28b4be350f8d77410 SHA512 b6b1aeec26a1c114eeec0bdf18d4b3160fe02dac2920a39a045acb74e62aa8f8a28e6a81c01fedba7976e4dd0c96463e0f1badfddd3015eef9197b01586a236d
-EBUILD mediawiki-1.33.1.ebuild 2429 BLAKE2B 8bb74e2af72ad74283b19e1e233181de5186e62dde63c6731c3a80123bb1d80ff97f8fd34132e6c6ab1918af84186caa1bcefcd61c222af961d00e1ead37c9e1 SHA512 5b222928ee037a1087ca48cf5603bcddad1b41b6020574116274e155f0d7aa548943cf9c7d6acbec4c64405c408d3ac74026a44eff5483d27f9f8a067f2c307b
-EBUILD mediawiki-1.33.2.ebuild 2432 BLAKE2B fd1ec71f6a4d766708b13e279c0d54449b50574ce019313ae9815e20732c00053b31fb28cf9e89084444e1afe6dfca9d8f135e0693b7487f740386aeea4bb97a SHA512 96a7da76578eae6a2dc5c408e4bfeb279a318d87182506c665df0be27a3269d1150e6bde51ba110456124920e639fb4dbdfa5dc8cb783c409a1b322880fe6cca
-EBUILD mediawiki-1.34.0.ebuild 2363 BLAKE2B dd69717c7d1dffd399d2374a035930134c030274e77f4b1cbdaee98818decdc69536493f8a68a9a1dce37831d41836b75204e5b861d1432aa9c52a7f57dd88e0 SHA512 289906b96aadc3dd4bd35a075fed652ab0ecece647d2d06fe98e76675a38a6831956e574e6afa4bab14d92ab8c0e3c0aabbe4cf051375f1ffc3008f5f5a18d53
+EBUILD mediawiki-1.34.0.ebuild 2360 BLAKE2B 17b4411c0ba994d1b9864a69d540478ac9e9cf77810aa0a484afd6288d66cceb37a100cef3e79fd1e47be7c3fcec9ec852b5042db40ded8e68c7c253a0fcb2bd SHA512 a6074fb4648e15e108a94ed4ba4000ee8056dd9bbd8fb6e7f1c27aa25e2cae0b4bbf6c82eb8b1a23dccf52d96da10cddf9bcacb5c86a3e137788b039647a9748
 MISC metadata.xml 246 BLAKE2B 6bdcea4d16a06756a1ab24fb076af6d88134c134f9239e658b7e5facb8cf6ed2f30d98938fd92bc8a3690e54273fd7f72420ccab04e7a6f7319e257a9f9ed618 SHA512 1181711d3b020b2ca7beae0a539a9b7f1abe70962cd8561900e5f06e14c9c871c61ca6088fb674de19ef3b844a1b3c29cf0f84f638b2d0cb7c030f60cd1d42ed
diff --git a/www-apps/mediawiki/mediawiki-1.33.1.ebuild b/www-apps/mediawiki/mediawiki-1.33.1.ebuild
deleted file mode 100644
index b64e691018f9..000000000000
--- a/www-apps/mediawiki/mediawiki-1.33.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit webapp
-
-MY_BRANCH=$(ver_cut 1-2)
-
-DESCRIPTION="The MediaWiki wiki web application (as used on wikipedia.org)"
-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"
-IUSE="imagemagick mysql postgres sqlite"
-
-RDEPEND=">=dev-lang/php-7.0.0[fileinfo,iconv,json,mysql?,postgres?,session,ssl,unicode,xml,xmlreader]
-	imagemagick? ( virtual/imagemagick-tools )
-	!imagemagick? ( dev-lang/php[gd] )
-	mysql? (
-		|| ( >=dev-db/mariadb-5.5.8 >=dev-db/mysql-5.5.8 )
-		)
-	sqlite? (
-		>=dev-db/sqlite-3.3.7[fts3(+)]
-		>=dev-lang/php-7.0.0[pdo]
-		|| ( dev-lang/php[sqlite] dev-lang/php[sqlite3] )
-	)
-	virtual/httpd-php"
-
-need_httpd_cgi
-
-RESTRICT="test"
-
-src_install() {
-	webapp_src_preinst
-
-	# First we install docs and then copy everything left into htdocs dir
-	# to avoid bugs like #236411.
-
-	# We ensure the directories are prepared for writing.  The post-
-	# install instructions guide the user to enable the feature.
-	local DOCS="FAQ HISTORY INSTALL README RELEASE-NOTES-${PV:0:4} UPGRADE"
-	dodoc ${DOCS} docs/*.txt
-	docinto php-memcached
-	dodoc docs/php-memcached/*
-
-	# Clean everything not used at the site...
-	rm -rf ${DOCS} COPYING tests docs || die
-	find . -name Makefile -delete || die
-	# and install
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	# If imagemagick is enabled then setup for image upload.
-	# We ensure the directory is prepared for writing.
-	if use imagemagick ; then
-		webapp_serverowned "${MY_HTDOCSDIR}"/images
-	fi
-
-	webapp_postinst_txt en "${FILESDIR}/postinstall-1.18-en.txt"
-	webapp_postupgrade_txt en "${FILESDIR}/postupgrade-1.16-en.txt"
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		echo
-		elog "=== Consult the release notes ==="
-		elog "Before doing anything, stop and consult the release notes"
-		elog "/usr/share/doc/${PF}/RELEASE-NOTES-${PV:0:4}.bz2"
-		echo
-		elog "These detail bug fixes, new features and functionality, and any"
-		elog "particular points that may need to be noted during the upgrade procedure."
-		echo
-		ewarn "Back up existing files and the database before upgrade."
-		ewarn "http://www.mediawiki.org/wiki/Manual:Backing_up_a_wiki"
-		ewarn "provides an overview of the backup process."
-		echo
-	fi
-}
diff --git a/www-apps/mediawiki/mediawiki-1.33.2.ebuild b/www-apps/mediawiki/mediawiki-1.33.2.ebuild
deleted file mode 100644
index bed5bd82992b..000000000000
--- a/www-apps/mediawiki/mediawiki-1.33.2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit webapp
-
-MY_BRANCH=$(ver_cut 1-2)
-
-DESCRIPTION="The MediaWiki wiki web application (as used on wikipedia.org)"
-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"
-IUSE="imagemagick mysql postgres sqlite"
-
-RDEPEND=">=dev-lang/php-7.0.0[fileinfo,iconv,json,mysql?,postgres?,session,ssl,unicode,xml,xmlreader]
-	imagemagick? ( virtual/imagemagick-tools )
-	!imagemagick? ( dev-lang/php[gd] )
-	mysql? (
-		|| ( >=dev-db/mariadb-5.5.8 >=dev-db/mysql-5.5.8 )
-		)
-	sqlite? (
-		>=dev-db/sqlite-3.3.7[fts3(+)]
-		>=dev-lang/php-7.0.0[pdo]
-		|| ( dev-lang/php[sqlite] dev-lang/php[sqlite3] )
-	)
-	virtual/httpd-php"
-
-need_httpd_cgi
-
-RESTRICT="test"
-
-src_install() {
-	webapp_src_preinst
-
-	# First we install docs and then copy everything left into htdocs dir
-	# to avoid bugs like #236411.
-
-	# We ensure the directories are prepared for writing.  The post-
-	# install instructions guide the user to enable the feature.
-	local DOCS="FAQ HISTORY INSTALL README RELEASE-NOTES-${PV:0:4} UPGRADE"
-	dodoc ${DOCS} docs/*.txt
-	docinto php-memcached
-	dodoc docs/php-memcached/*
-
-	# Clean everything not used at the site...
-	rm -rf ${DOCS} COPYING tests docs || die
-	find . -name Makefile -delete || die
-	# and install
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	# If imagemagick is enabled then setup for image upload.
-	# We ensure the directory is prepared for writing.
-	if use imagemagick ; then
-		webapp_serverowned "${MY_HTDOCSDIR}"/images
-	fi
-
-	webapp_postinst_txt en "${FILESDIR}/postinstall-1.18-en.txt"
-	webapp_postupgrade_txt en "${FILESDIR}/postupgrade-1.16-en.txt"
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		echo
-		elog "=== Consult the release notes ==="
-		elog "Before doing anything, stop and consult the release notes"
-		elog "/usr/share/doc/${PF}/RELEASE-NOTES-${PV:0:4}.bz2"
-		echo
-		elog "These detail bug fixes, new features and functionality, and any"
-		elog "particular points that may need to be noted during the upgrade procedure."
-		echo
-		ewarn "Back up existing files and the database before upgrade."
-		ewarn "http://www.mediawiki.org/wiki/Manual:Backing_up_a_wiki"
-		ewarn "provides an overview of the backup process."
-		echo
-	fi
-}
diff --git a/www-apps/mediawiki/mediawiki-1.34.0.ebuild b/www-apps/mediawiki/mediawiki-1.34.0.ebuild
index 15845b96fee6..7b3c6904caee 100644
--- a/www-apps/mediawiki/mediawiki-1.34.0.ebuild
+++ b/www-apps/mediawiki/mediawiki-1.34.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ 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"
 
 RDEPEND=">=dev-lang/php-7.2.9[ctype,fileinfo,iconv,json,mysql?,postgres?,session,ssl,unicode,xml,xmlreader]
diff --git a/www-apps/postfixadmin/Manifest b/www-apps/postfixadmin/Manifest
index 5bb187205f4b..94ef62339ae8 100644
--- a/www-apps/postfixadmin/Manifest
+++ b/www-apps/postfixadmin/Manifest
@@ -1,6 +1,4 @@
 AUX postinstall-en-2.3.txt 1827 BLAKE2B 49402566ddf6981cf0226f6a963fdd2c482957903583807f5c42731dfd5b4aea56de7d1ebd47ab6909f12492bd5e7a788322e0b2d80e15d883483a080f8fe11c SHA512 59e304d63830227b1619ed1299e9b61f5b6e534cb03da4d3a0e35a0fe727ccf2d994a034bd12d515bba4f8a6a8ca513cf2131c031fa63f85906639aca159993a
 DIST postfixadmin-3.2.3.tar.gz 1330423 BLAKE2B 95aeb1a5f3b1dca2ce60e3e6a974f59b8c0e649c185149adb5d1259477cfe113b59c06f825cc9e1a38741260f111eaa3eef5a26ca44260aea2277b16f1f54543 SHA512 d44addb9a3ca830caf55b603363054df561d659957f21cab7523465ebf02ca18abe7fcf298fe718d957d0b7bf5613e2dde69c78c26e0f7f6f595d79b28fe08ab
-DIST postfixadmin-3.2.tar.gz 1324335 BLAKE2B 39fe9174f9085b35a58cacac1e99cc1a9209dbb029c903dbbab4fc68f041687e94327ea379e11c6967810d786bae0758f77f5cc2359d82720bb8edada61717d5 SHA512 eca4903dc3a22e56585c6f1b028a0f93d2422574faf9458b369b071880af55b36cd52c5ff9b0438c2c129a561404414b5d1f926043b40700fb5e31bffffe6ec7
-EBUILD postfixadmin-3.2.3.ebuild 2770 BLAKE2B 1bf903c27562ec4f4fed7ddd072513d7de0e124cd352d69440da3940ba6d65bb9e0ecfd0acfde51ef238852d6b28c82dba5cb56f39b2ab8531b4db3dc75c71f5 SHA512 f0bc5a023e67253a63594ea9a819703e1f79ab6d0de463f2c322bc5bcd450143ee97310111b733591d56b7d1373917418d94868591be61b0d28423b996035f3d
-EBUILD postfixadmin-3.2.ebuild 2737 BLAKE2B cf0db4e97f27a0d367cb61d2aaf58703d7f37130782b13489358adefde70faa77ba52f0833c8cadb0c6cbc4a94d6fc4d428f975fe1cf4dc3b317ffd5a0f55ebd SHA512 57c0288e7228b35bb928f699aa170e60dd3cdcdef6a48c5abac7e3b673dc81d5ba857a0c1dd6dedf65b976b003fcc6d79bd35cfb5e1ff2afbf4f2aa6856358d6
+EBUILD postfixadmin-3.2.3.ebuild 2768 BLAKE2B 66416892e98549be73a888f6ec88035b4bb50ec522bbdcb61fc982c76c348b3ab4194938b9b823757c8a45f135fdee5ff1cbaee9312df2d1e8e664a1f2b331b1 SHA512 ce03e644d2b0a6a9a7ffeee1fa374ea255808e7ab901564c08eccf1835e99da93bae94f674b4ed5440563712cd6e8b0582b010fff9a7492184a2aa5d0664ff46
 MISC metadata.xml 536 BLAKE2B 0ec01f47f106656e1b98ca14d8b531597a34cfb2fd261c93c775d7dd3b0a08155e9e912a20a2330946697418898ed08d9be6f8409edb5e1ef6009cafddde2437 SHA512 4657f3ae892ad55572ac39f23cebcef58480d4ff608150c75d2cf3f0046b5e0a2861f9bf8dfffd45aef580675feae11a05297a7a99f63997d43ab703372ddf4a
diff --git a/www-apps/postfixadmin/postfixadmin-3.2.3.ebuild b/www-apps/postfixadmin/postfixadmin-3.2.3.ebuild
index b998b917d863..7682db279b43 100644
--- a/www-apps/postfixadmin/postfixadmin-3.2.3.ebuild
+++ b/www-apps/postfixadmin/postfixadmin-3.2.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://postfixadmin.sourceforge.net"
 SRC_URI="https://github.com/postfixadmin/postfixadmin/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="+mysql postgres +vacation"
 REQUIRED_USE="|| ( mysql postgres )"
 
diff --git a/www-apps/postfixadmin/postfixadmin-3.2.ebuild b/www-apps/postfixadmin/postfixadmin-3.2.ebuild
deleted file mode 100644
index 75b569837248..000000000000
--- a/www-apps/postfixadmin/postfixadmin-3.2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit user webapp
-
-DESCRIPTION="Web Based Management tool for Postfix style virtual domains and users"
-HOMEPAGE="http://postfixadmin.sourceforge.net"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="+mysql postgres +vacation"
-REQUIRED_USE="|| ( mysql postgres )"
-
-DEPEND="
-	dev-lang/php:*[unicode,imap,postgres?]
-	vacation? (
-		dev-perl/DBI
-		dev-perl/Email-Sender
-		dev-perl/Email-Valid
-		dev-perl/Log-Dispatch
-		dev-perl/Log-Log4perl
-		dev-perl/MIME-Charset
-		dev-perl/MIME-EncWords
-		mysql? ( dev-perl/DBD-mysql )
-		postgres? ( dev-perl/DBD-Pg )
-	)
-"
-
-RDEPEND="${DEPEND}
-	virtual/httpd-php
-	mysql? ( || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) )"
-
-need_httpd_cgi
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	if use vacation; then
-		enewgroup vacation
-		enewuser vacation -1 -1 -1 vacation
-	fi
-}
-
-src_install() {
-	webapp_src_preinst
-
-	if use vacation; then
-		insinto /var/spool/vacation
-		newins VIRTUAL_VACATION/vacation.pl vacation.pl-${SLOT}
-		fowners vacation:vacation /var/spool/vacation/vacation.pl-${SLOT}
-		fperms 770 /var/spool/vacation/vacation.pl-${SLOT}
-		dodoc VIRTUAL_VACATION/FILTER_README
-		newdoc VIRTUAL_VACATION/INSTALL.md VIRTUAL_VACATION_INSTALL.md
-		rm -r VIRTUAL_VACATION/{vacation.pl,INSTALL.md,tests,FILTER_README} || die
-	fi
-
-	insinto /usr/share/doc/${PF}/
-	doins -r ADDITIONS
-
-	local docs="DOCUMENTS/*.txt INSTALL.TXT CHANGELOG.TXT"
-	dodoc ${docs}
-
-	rm -rf ${docs} DOCUMENTS/ GPL-LICENSE.TXT LICENSE.TXT debian/ tests/ ADDITIONS/
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_configfile "${MY_HTDOCSDIR}"/config.inc.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-2.3.txt
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-	if use vacation; then
-		# portage does not update owners of directories (feature :)
-		chown vacation:vacation "${ROOT}"/var/spool/vacation/
-		einfo "/var/spool/vacation/vacation.pl symlink was updated to:"
-		einfo "/var/spool/vacation/vacation.pl-${SLOT}"
-		ln -sf "${ROOT}"/var/spool/vacation/vacation.pl{-${SLOT},} || die
-	fi
-}
-
-pkg_postrm() {
-	# Make sure we don't leave broken vacation.pl symlink
-	find -L "${ROOT}"/var/spool/vacation/ -type l -delete
-	local shopt_save=$(shopt -p nullglob)
-	shopt -s nullglob
-	local vacation=( "${ROOT}"/var/spool/vacation/vacation.pl-* )
-	${shopt_save}
-	if [[ ! -e "${ROOT}"/var/spool/vacation/vacation.pl && -n ${vacation[@]} ]]; then
-		ln -s "${vacation[-1]}" "${ROOT}"/var/spool/vacation/vacation.pl || die
-		ewarn "/var/spool/vacation/vacation.pl was updated to point on most"
-		ewarn "recent verion, but please, do your own checks"
-	fi
-}