Another series of cleanups

10 files changed, 28 insertions, 30 deletions

diff --git a/www-apps/gallery/Manifest b/www-apps/gallery/Manifest
index dc1316a..0b5f67a 100644
--- a/www-apps/gallery/Manifest
+++ b/www-apps/gallery/Manifest
@@ -1,4 +1,4 @@
 AUX postinstall-en2.txt 912 BLAKE2B fab025e4bc66a7e80b6f37f812c85bf235be55d364ece3b21a3318bd07cde75621613856b44e919768a32c05b1f5ff8139be55fdd475a5eda69399e14c8eb022 SHA512 fc66ccea1ef358b75ef0710a9a6b32e3b363d6588d70b69987041f46f5d04013d36113b3fca426f6a38d4d94e0ccfba637e56f91e41f62c492a8ad1fda64e408
 DIST gallery-2.3.2-full.tar.gz 14569436 BLAKE2B f611c925b30da2a2507674d6ed606c2856c72c62ec41b1528cab4eff5527a18e4c61268dac95907c90c7391f99ac08f51a755781848bb7a1ff668ed17fd30f65 SHA512 e4ee2007018ecdc6df2cb715798f57a94d2fcf5618a06812d704b45ba398cc9f52465d4ea1d830f2b99611c85d8853d7639059b3761f3b5d77ccc16d1e4ae0ad
-EBUILD gallery-2.3.2.9999.ebuild 1970 BLAKE2B 478f4932298a01a1b4809c921cd7dc64fc7ef706bc42772ae0da87b543812e647f75de108aa8239dc047c2c3af9211dcd9aa320c24453145f42a1ccaf7b561dd SHA512 1032e0cc8290da1120b4809abb74c375d3492fcfc2ee42ca6b7a173293712c18bfa0433e80902935c94b7cb0cea9be4a18c1d339465d0c7051e6394329820e35
-EBUILD gallery-2.3.2.ebuild 1981 BLAKE2B 19e4f25ed67f79b35e57f66712cedaadd637ef0b6d245827f7890fba5a3a4462b68620f6ad68dfd27d71e8ccc8b27822f2a4f9e1282427906fb09805b31df011 SHA512 97d1f705c9e7f9cc34080c17bf9ef62968d71d1f86ee20bfc59f8c1548338afdbdcb6f4ee3416e4305b6ee249d5220c2dd7301004472bbf4a6782fdb04150bb8
+EBUILD gallery-2.3.2.9999.ebuild 1853 BLAKE2B 177199d3afb88b30f56658db1147585f32525317d132bd611d11f3b35b3339a386f82557c839461e1f9ca652cfb266641069b519403a273fb592068ba59ba97c SHA512 2beca3c7bf075c43bbf2062a05a7f6bdf74097f1cf6d4ef82afd7a9d96fefea9573347e66b61b1fa4011d428ad7083dd97e3e547bc4b9f19fafbd15212867e49
+EBUILD gallery-2.3.2.ebuild 1864 BLAKE2B d7cd9e72ff1f9ca2766f6d4c123f3e8dfbd2dd6b373f32d42950b52804429c07cdbee31869038a1c236a9f07e660a38b00cd08e766e5be5fd729a800505b4412 SHA512 d06209fc1ba5769741010d06d2184fcf620ca4b6ee8141fa9db9130feb677dfeff9b1d714aeb142e3e43a5a0edb9cd2552400a66eb141f00e45f2b7be1d95733
diff --git a/www-apps/gallery/gallery-2.3.2.9999.ebuild b/www-apps/gallery/gallery-2.3.2.9999.ebuild
index f51cc39..57af3b6 100644
--- a/www-apps/gallery/gallery-2.3.2.9999.ebuild
+++ b/www-apps/gallery/gallery-2.3.2.9999.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/gallery-2.3.2.ebuild,v 1.8 2015/07/05 22:06:42 blueness Exp $
 
-EAPI="6"
+EAPI="7"
 
 inherit webapp eutils
 
diff --git a/www-apps/gallery/gallery-2.3.2.ebuild b/www-apps/gallery/gallery-2.3.2.ebuild
index fc602e0..d9eb3bb 100644
--- a/www-apps/gallery/gallery-2.3.2.ebuild
+++ b/www-apps/gallery/gallery-2.3.2.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/gallery-2.3.2.ebuild,v 1.8 2015/07/05 22:06:42 blueness Exp $
 
-EAPI="6"
+EAPI="7"
 
 inherit webapp eutils
 
diff --git a/www-apps/joomla/Manifest b/www-apps/joomla/Manifest
index 1831f73..c76749f 100644
--- a/www-apps/joomla/Manifest
+++ b/www-apps/joomla/Manifest
@@ -1,4 +1,4 @@
 AUX postinstall-en.txt 916 BLAKE2B 0f89355cd8a1f9507de8a231c519930d25887717ae9519b90f5d77e9f928d8846585236a7c7cf5f48349508e5a811288f5833fd175d10d1c119c6a772c9ef12b SHA512 d53b2d2b2d9cb1cb83bf452f71d7098e5c6a460bdfa914e7d9bf57090544931eeeae249cf0e738a73c351f06854f7e3490e1c5d84271be43e45bec91a32c732a
 AUX postinstall-sv.txt 764 BLAKE2B 6cf5780b60c39b35845557d4e386ca4e2f2c5ca9e7fa45fd67feedf108d57ac5d1a11b80bb68861a14f30c83f55302f9cc49a4dff25015faec5ebac2a4c1a071 SHA512 4a7110fd497d5330fd289743942a9339bd7b7ffa0812578c4552ae539774576ca7ce6df8bc8ed45ca6bb4d61d7183c1094d6a2480988497e131f3687274b3e0b
 DIST Joomla_3.9.11-Stable-Full_Package.tar.bz2 7948739 BLAKE2B 5169cd2c92b875b5f9ce4a9a52cc0bf8d8ad141e75e8c839b0ad77c71dddf496f9e622be6a6a25b7f8c8e267e7598ce08aa09191b586754a8c6df1a97d1502f0 SHA512 f3676dc54a609d4f064b6ed8945c4ffdb6a17664d17e2dc919c21783ae9db4a7dc619ae3a7728f62e25c9ac926a8eba4f076e500cd5744c82d25fdcdb41784df
-EBUILD joomla-3.9.11.ebuild 1495 BLAKE2B d1345412d9ef0aaec2c48eb15ae3c5bef4dc9208525727bf2d56dbb219cea8bee908d21a62e6bb8e99b71ab933354149050f6eb9ef46163da83de3623398c2d3 SHA512 25b5d1210902d8154b9201cbd99a326a5f099ec641af68430441d67412d953eb9b21ed58ea2ac9a458e04a3af088b12dd9c78b8d6cae96d0842c2023b296da51
+EBUILD joomla-3.9.11.ebuild 1449 BLAKE2B 2e4ec4e9792d9ceb98619d01ae70fcdd8ebfd178cce01bfca9ed79181523bfced54ddebbab56df20101983d235c6a31727a33d72f14f1b8b675f7547d2282b97 SHA512 9a8496ec2d7a806a39d31174b9bacfefac5ff26748d72de64ecb2787156b4f13a9f70fbdd9ca1d455e1f66f63a4cae8cc47c2c4d4746aac65eff29d93b3d0b81
diff --git a/www-apps/joomla/joomla-3.9.11.ebuild b/www-apps/joomla/joomla-3.9.11.ebuild
index e3ead25..dcded18 100644
--- a/www-apps/joomla/joomla-3.9.11.ebuild
+++ b/www-apps/joomla/joomla-3.9.11.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
-EAPI=5
-inherit webapp versionator
+EAPI=7
+inherit webapp
 
-MY_PV=$(replace_version_separator '_' '-')
+MY_PV="${PV//_/-}"
 
 DESCRIPTION="A powerful Open Source Content Management System"
 HOMEPAGE="http://www.joomla.org/"
diff --git a/x11-apps/blueproximity/Manifest b/x11-apps/blueproximity/Manifest
index 22b652a..db8c49b 100644
--- a/x11-apps/blueproximity/Manifest
+++ b/x11-apps/blueproximity/Manifest
@@ -1,2 +1,2 @@
 DIST blueproximity-1.2.5.tar.gz 301090 BLAKE2B 0642f381ff14e2461ec6430867ccaa8df3e397b83c2dfc559bc31477bc14edad63baa312326bb352cced8bd45be3b805d3f1a61e4af12fa2e4daeb53b200af01 SHA512 d72f3d1b15538a31d0eced6627fc0dc16c7404be0ddfb3bf6d13c9a0a1b089e9f001d50a26e1a1d4015e07b0013e78001b2b204f94ef21cd0de49b42550b5436
-EBUILD blueproximity-1.2.5.ebuild 1395 BLAKE2B 7f09485c5cb0c62692574849398c3a083d6a617e5ed4b7eac48e35bbba6c45801a268fc8269862a73ffe31ad9d00f6fd412c238651fc24cab6c56be360a76135 SHA512 1930c5c67c283a2065cc74074475c2996b13435a6ea5b5479cfee55e4b2a9655c52bfba74558328ee90db0b4c2a9a06bf862c6e15fbefda0bc0d7c808ed1f16f
+EBUILD blueproximity-1.2.5.ebuild 1340 BLAKE2B 23bca73a6690b20746a6669fa9cd5c012035f1cea385bb71ada7cc0f505e27096c3303fa86510e0684116cf550bc67759b3eb794a2795960d813c59963f851e5 SHA512 5e8fc2e7b65cddd66777cd665f96f430ffdeb5588a7ed8941e78f7753a125274d87919864de4b7a8e33af4ac3a7f6710003f9ef38a23a3a80da3180d6d592b74
diff --git a/x11-apps/blueproximity/blueproximity-1.2.5.ebuild b/x11-apps/blueproximity/blueproximity-1.2.5.ebuild
index 7d2f8ab..dad87e5 100644
--- a/x11-apps/blueproximity/blueproximity-1.2.5.ebuild
+++ b/x11-apps/blueproximity/blueproximity-1.2.5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 
@@ -14,7 +14,6 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 IUSE=""
 
 MY_AVAILABLE_LINGUAS="de en es fa hu it ru sv th"
-IUSE="${IUSE} ${MY_AVAILABLE_LINGUAS// / linguas_}"
 
 SLOT="0"
 
diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest
index 98b8c45..b6119fa 100644
--- a/x11-wm/compiz/Manifest
+++ b/x11-wm/compiz/Manifest
@@ -1,2 +1,2 @@
-AUX access_violation.patch 974 BLAKE2B 9b226e3d7255073bff22448f096fc19f743b97582b2e4de2725c7df84f0895bb63b7eee25d3b82f08090b19b5ea9c1179d57d1eaf994bfabc42e4e04e8f1ec33 SHA512 0d91b71ad9c2646745d91a8a6b3d9228a23dccb3971abf69094ca4f6b3055f92570f01eb6dda62acab8630c05cc9480e846b59bd3b6044a73b31510d72a8f800
-EBUILD compiz-9999.ebuild 3605 BLAKE2B 4862e2c53d14a5e5e852a67b4167a585770d5e7cd8c04b2b816e20759a0beec9a63b39033bd7deacf10c7f99da54d696d03745309a06507a41446aabf7b6b51d SHA512 5bc4b0c07332dbef3e16989c35ee05a52bf0f7e3d8e6622e47b5915aa41fc4568fe5738bfbe27b6e3651a9460a6bd56829c437b110d402da8e3bceef78653390
+AUX access_violation.patch 1023 BLAKE2B cc06552acc0241a4f4c30feee61023023143fbb935cf925a9c18037ddb6d8bb6ceafd6f8b05da5ab40b448195cbfdd71cd3a145d204330c7c4f708e26e9aead5 SHA512 9772aaa487284599ecbffabee4bc91d522c71797c3e08dddd549b4f13c1565f861c66a1b63feb72ce12b4432d852e259de2d22c9b82314ebcf28d10420736a63
+EBUILD compiz-9999.ebuild 3640 BLAKE2B 361ad9d52e6747d6765c4fc7c9fff95e94e39d77b62494d2b2c620962568365228c5881e73a9b673353c919d88745a29913a8a0d5e5dd641cb341d8536cee145 SHA512 9925d4dfe799deca91b9d8520274c389790115254d6cb0dd0c1e30f63c9d38f3be1f14b0c3544eb16b5f660f4d5b608e7ee369810f8948fea5327df681b4765e
diff --git a/x11-wm/compiz/compiz-9999.ebuild b/x11-wm/compiz/compiz-9999.ebuild
index dfd28b6..587ebc6 100644
--- a/x11-wm/compiz/compiz-9999.ebuild
+++ b/x11-wm/compiz/compiz-9999.ebuild
@@ -1,6 +1,7 @@
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 PYTHON_COMPAT=( python3_{4,5,6} )
 
 inherit cmake-utils eutils gnome2-utils xdg-utils python-single-r1 toolchain-funcs
@@ -61,13 +62,13 @@ COMMONDEPEND="
 	virtual/opengl
 	virtual/glu
 	cairo? ( x11-libs/cairo[X] )
-	fuse? ( sys-fs/fuse )
+	fuse? ( sys-fs/fuse:= )
 	gtk? (
 		x11-libs/gtk+:3
 		x11-libs/libwnck:3
 		x11-libs/pango
 		gnome? (
-			gnome-base/gnome-desktop
+			gnome-base/gnome-desktop:=
 			gnome-base/gconf
 			x11-wm/metacity
 		)
@@ -87,10 +88,12 @@ DEPEND="${COMMONDEPEND}
 	)"
 
 RDEPEND="${COMMONDEPEND}
-	dev-python/pygtk
 	x11-apps/mesa-progs
 	x11-apps/xvinfo
 	x11-themes/hicolor-icon-theme"
+PATCHES=(
+	"${FILESDIR}/access_violation.patch"
+)
 
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != binary ]]; then
@@ -109,8 +112,7 @@ src_prepare() {
 	sed -i \
 		-e 's|CYTHON_BIN cython3|CYTHON_BIN cython|' \
 		-e "s|/lib/python|/$(get_libdir)/python|" \
-		compizconfig/compizconfig-python/CMakeLists.txt
-	epatch "${FILESDIR}"/access_violation.patch
+		compizconfig/compizconfig-python/CMakeLists.txt || die
 	eapply_user
 }
 
diff --git a/x11-wm/compiz/files/access_violation.patch b/x11-wm/compiz/files/access_violation.patch
index 92af367..12df855 100644
--- a/x11-wm/compiz/files/access_violation.patch
+++ b/x11-wm/compiz/files/access_violation.patch
@@ -1,13 +1,13 @@
---- compizconfig/libcompizconfig/config/CMakeLists.txt.old	2015-02-03 12:09:12.000000000 +0100
-+++ compizconfig/libcompizconfig/config/CMakeLists.txt	2015-06-14 13:12:15.009100624 +0200
+--- compiz-9999/compizconfig/libcompizconfig/config/CMakeLists.txt.orig	2015-02-03 12:09:12.000000000 +0100
++++ compiz-9999/compizconfig/libcompizconfig/config/CMakeLists.txt	2015-06-14 13:12:15.009100624 +0200
 @@ -4,4 +4,4 @@
  configure_file (${CMAKE_CURRENT_SOURCE_DIR}/config_test
  		${CMAKE_CURRENT_BINARY_DIR}/compiz-1/compizconfig/config)
  
 -install (FILES ${_config_file} DESTINATION ${COMPIZCONFIG_CONFIG_DIR})
 +install (FILES ${_config_file} DESTINATION $ENV{DESTDIR}${COMPIZCONFIG_CONFIG_DIR})
---- cmake/recompile_gsettings_schemas_in_dir_user_env.cmake.orig	2016-08-01 22:56:04.317994940 +0200
-+++ cmake/recompile_gsettings_schemas_in_dir_user_env.cmake	2016-08-01 22:58:03.707528553 +0200
+--- compiz-9999/cmake/recompile_gsettings_schemas_in_dir_user_env.cmake.orig	2016-08-01 22:56:04.317994940 +0200
++++ compiz-9999/cmake/recompile_gsettings_schemas_in_dir_user_env.cmake	2016-08-01 22:58:03.707528553 +0200
 @@ -18,6 +18,6 @@
  if (GLIB_COMPILE_SCHEMAS)