Merge updates from master

app-misc/mat2/Manifest

@@ -1 +1 @@
-DIST mat2-0.9.0.tar.gz 5660801 BLAKE2B 069076d95e3594bcd842861cf96fdf2849c7f955f34af3ca55b2204792c25de8d774eed6920674c596258b6f0f3dded6f1fa204bd615e3ced1029f8d7b049dbb SHA512 b343a3b48240b899ba2be677457591ce3e7f72cdefaeba84ce8a8f385b2279afe37aac097bebab536651d9eb9b473981df5907ea174278834b2b9773723f95e5
+DIST mat2-0.10.0.tar.gz 5720611 BLAKE2B 3aeb1b5fb1e5b39d5a59e84de48a1fefed8afff31d7ae2827324b9d54eab8a95f28f0e1de94d6c96ba250249531782f4a2cff4a82fdccc85da7382d00294fdaf SHA512 7434365766f5ba893b5b51e852d73af6b1dd562f3804e46b2aa5bf2097694d5465f0ddb5e401b157ed899a86caca2dd405424c5a7c86d66190cefd30eee3ba65

app-misc/mat2/mat2-0.10.0.ebuild

@@ -0,0 +1,40 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Supports python3_8 but not all it's deps in the tree do yet
+PYTHON_COMPAT=(python3_{5,6,7})
+PYTHON_REQ_USE="xml"
+
+inherit distutils-r1
+
+DESCRIPTION="Metadata Anonymisation Toolkit: handy tool to trash your metadata"
+HOMEPAGE="https://0xacab.org/jvoisin/mat2"
+LICENSE="LGPL-3"
+SLOT="0"
+SRC_URI="https://0xacab.org/jvoisin/mat2/-/archive/${PV}/${P}.tar.gz"
+KEYWORDS="~amd64"
+IUSE="+exif sandbox video test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE} test? ( exif video )"
+RESTRICT="!test? ( test )"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="
+	${DEPEND}
+	media-libs/mutagen:0[${PYTHON_USEDEP}]
+	dev-python/pycairo:0[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	gnome-base/librsvg:2[introspection]
+	x11-libs/gdk-pixbuf:2[introspection]
+	app-text/poppler[introspection]
+	exif? ( media-libs/exiftool:* )
+	sandbox? ( sys-apps/bubblewrap )
+	video? ( media-video/ffmpeg:* )
+	test? (
+		media-video/ffmpeg[mp3,vorbis]
+		x11-libs/gdk-pixbuf:2[jpeg,tiff]
+	)
+"
+
+distutils_enable_tests unittest

app-misc/mat2/mat2-0.9.0.ebuild

@@ -1,23 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=(python3_5 python3_6)
-
-inherit distutils-r1
-
-DESCRIPTION="Metadata Anonymisation Toolkit: handy tool to trash your metadata"
-HOMEPAGE="https://0xacab.org/jvoisin/mat2"
-LICENSE="LGPL-3"
-SLOT="0"
-SRC_URI="https://0xacab.org/jvoisin/mat2/-/archive/${PV}/${P}.tar.gz"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="
-	media-libs/mutagen:*
-	dev-python/pygobject:3
-	dev-python/pycairo:*
-"
-RDEPEND="${DEPEND}"

app-misc/mat2/metadata.xml

@@ -9,4 +9,8 @@
 		<bugs-to>https://0xacab.org/jvoisin/mat2/issues</bugs-to>
 		<changelog>https://0xacab.org/jvoisin/mat2/tags?format=atom</changelog>
 	</upstream>
+	<use>
+		<flag name="video">Use <pkg>media-video/ffmpeg</pkg> for video support</flag>
+		<flag name="sandbox">Enable sandboxing functionality through <pkg>sys-apps/bubblewrap</pkg></flag>
+	</use>
 </pkgmetadata>

www-client/badwolf/Manifest

@@ -1 +1,2 @@
 DIST badwolf-0.3.0.tar.gz 11843 BLAKE2B 2d6e3efa7a91e5c68fed47832a8701f4450238e5cf3daafafe2c231fb774cf79859175351a2efc7c1cea9577e2316d03a0460edd74a8d0f40c158635b2c42cb5 SHA512 6775fc673d3c985d2420e017bdefb0b0106c395eada04f54415e901e40779ebc427ab1b3135e1489077b9fbf5529be9e5d4d81a9b87001a55dfe6c15efa0b8c6
+DIST badwolf-0.4.0.tar.gz 13646 BLAKE2B 1269fc361eb9c3ae45379e019b808e67f6e915f8f7fc00c757d939f15c02ccdb08083ba64c6ebfc97d7337293d4125a35337c0e8d908a3e3704cd2029d24212e SHA512 572e1c18223ded5989da9c47e42c9dcbf66903e38b672e33b098cc3f84965d9da8e0a8b71e5ec88f17879c8d2f931d9625ca26a9c5ae81cc925d62fbf2abd4f1

www-client/badwolf/badwolf-0.3.0.ebuild

@@ -11,7 +11,7 @@ then
 else
 	MY_P="${PN}-$(ver_rs 3 - 4 .)"
 	SRC_URI="https://hacktivis.me/releases/${MY_P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~ppc"
 	S="${WORKDIR}/${MY_P}"
 	inherit savedconfig
 fi

www-client/badwolf/badwolf-0.4.0.ebuild

@@ -0,0 +1,54 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ "${PV}" == "9999" ]]
+then
+	EGIT_REPO_URI="https://hacktivis.me/git/badwolf.git"
+	EGIT_MIN_CLONE_TYPE="single+tags"
+	inherit git-r3
+else
+	MY_P="${PN}-$(ver_rs 3 - 4 .)"
+	SRC_URI="https://hacktivis.me/releases/${MY_P}.tar.gz"
+	# Dropped because net-libs/webkit-gtk-2.26 isn't in ::gentoo
+	# KEYWORDS="~amd64 ~ppc"
+	S="${WORKDIR}/${MY_P}"
+	inherit savedconfig
+fi
+
+DESCRIPTION="Minimalist and privacy-oriented WebKitGTK+ browser"
+HOMEPAGE="https://hacktivis.me/projects/badwolf"
+LICENSE="BSD"
+SLOT="0"
+
+DOCS=("README.md" "KnowledgeBase.md")
+
+DEPEND="
+	x11-libs/gtk+:3
+	>=net-libs/webkit-gtk-2.26.0:4=
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	restore_config config.h
+	default
+}
+
+src_compile() {
+	emake \
+		CC="${CC:-cc}" \
+		CFLAGS="${CFLAGS:--02 -Wall -Wextra}" \
+		LDFLAGS="${LDFLAGS}" \
+		PREFIX="/usr"
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="/usr" \
+		install
+
+	save_config config.h
+	einstalldocs
+}

www-client/badwolf/badwolf-9999.ebuild

@@ -11,7 +11,7 @@ then
 else
 	MY_P="${PN}-$(ver_rs 3 - 4 .)"
 	SRC_URI="https://hacktivis.me/releases/${MY_P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~ppc"
 	S="${WORKDIR}/${MY_P}"
 	inherit savedconfig
 fi