Merge remote-tracking branch 'upstream/master' into master

CONTRIBUTING.md

@@ -33,8 +33,8 @@ When submitting an issue you will have to provide:
 
 - `category/package` (e.g. `www-client/icecat`)
 - the description of the package
-- the home page of the package 
+- the home page of the package
-- OPTIONAL: the direct download link of the package 
+- OPTIONAL: the direct download link of the package
 - the license of the package (e.g. GPLv2)
 
 by submitting the skeleton of the ebuild in quotes:
@@ -42,10 +42,10 @@ by submitting the skeleton of the ebuild in quotes:
 ```
 NAME=""
 
-DESCRIPTION=""     
+DESCRIPTION=""
-HOMEPAGE=""     
+HOMEPAGE=""
-SRC_URI=""     
+SRC_URI=""
-LICENSE=""     
+LICENSE=""
 ```
 
 After this, you can safely submit the issue, and we will take care of it.
@@ -119,7 +119,10 @@ If they fail describe why in the comments inside the ebuild
 ##### Package testing
 Make sure you have FEATURES="test" enabled in the make.conf
 ```bash
-echo 'FEATURES="${FEATURES} test"' >> make.conf
+if ! grep test /etc/portage/make.conf
+then
+    echo 'FEATURES="${FEATURES} test"' >> /etc/portage/make.conf
+fi
 ```
 And then, as root
 ```bash
@@ -150,9 +153,9 @@ Adjust the "type" and "organization-or-user/package" accordingly.
 #### Installation
 If the (system wide) repository is set up correctly you should be able to just emerge the package you added right away
 ```bash
-emegre --ask --verbose --jobs=1 --quiet-build=n category/package-name
+emegre --ask --jobs=1 --oneshot --quiet-build=n --verbose category/package-name
 ```
 
 #### Git
 Follow the rules described in ["Submitting Merge Requests"](#submitting-merge-requests-1) section.
-GPG signing is not required but encouraged. Gentoo Wiki provides a great example [how to create a strong key](https://wiki.gentoo.org/wiki/Project:Infrastructure/Generating_GLEP_63_based_OpenPGP_keys).
+GPG signing is not required but encouraged. Gentoo Wiki provides a great example [on creating a strong key](https://wiki.gentoo.org/wiki/Project:Infrastructure/Generating_GLEP_63_based_OpenPGP_keys).

WARNING.md

@@ -8,7 +8,7 @@ Before you continue, **read [TODO.md](../TODO.md)!**
 You can still file issues to let us and others know when something breaks.
 
 - kernel packages may install a different version, check the version you got after installation
-- Waterfox is broken, like 80% of the time, we know...
+- Icecat is broken, like 80% of the time, we know...
 
 
 ## Outdated packages

games-emulation/melonds/metadata.xml

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+    <maintainer type="person">
+        <email>xgqt@protonmail.com</email>
+        <name>Maciej Barć</name>
+    </maintainer>
     <upstream>
         <remote-id type="gitlab">Arisotura/melonDS</remote-id>
     </upstream>

games-strategy/mindustry/Manifest

@@ -1,2 +1,3 @@
 DIST mindustry-104.6.jar 48910370 BLAKE2B 62d6ca658d3a440028b76908a95ff4e8265edfe50caf5c882007bcb8a7105aeb613a07f3dbe71e2bc38bc0daeeeeac20f4a7796c0475b7dd42667c6d7ccdfaae SHA512 9f19d0c8e9b9611a254de12c60c3ab3802631a9e79c518d6039dca18ae80b4d7734f1f39fc17c7d24f249495068301123e2ff4e48a196e63a00d019071a7f398
 DIST mindustry-106.jar 59405252 BLAKE2B 9a227bd59be64be37bce2d664ff398b1c140998c17369dba026d4009f5d0f65889d19040c6bfa225fa06d93ed09c767b27723b16037b7d33ad9c31b82ece06c2 SHA512 e481440329224f135ac32894f5ebdd56e4ce4b58ebdda1deebccba8ad46241e6f7add4b8edc111346d9f513055a70cafe67518d6cad60c9284cb65277f2eb688
+DIST mindustry-107.jar 59014002 BLAKE2B dbcdbddfc93e87204e41e119bd91cda785e23cbe77e9e2df6d78a0a53e1bf2cad22d6eac6097eed536bd9f570f9845f447afe44f39ea5c4077a69e54eab7327b SHA512 8cbf2fc2a0066e02762d0b6c8a5cc5f51d1a48876a62137823e2fe2ffc6eccb1c0e62a4fdb17ff7d260856f3268b094b361fca9f02dfda49dcc826b86d7bffa4

games-strategy/mindustry/mindustry-107.ebuild

@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN^}"
+
+inherit desktop eutils xdg
+
+DESCRIPTION="A sandbox tower defense game"
+HOMEPAGE="https://mindustrygame.github.io"
+SRC_URI="https://github.com/Anuken/${MY_PN}/releases/download/v${PV}/${MY_PN}.jar -> ${P}.jar"
+
+RESTRICT="mirror strip"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	>=virtual/jdk-1.7:*
+"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	cp "${DISTDIR}/${P}.jar" "${S}/${MY_PN}.jar" || die
+}
+
+# src_prepare() {
+# 	cp "${P}.jar" "${MY_PN}.jar"
+# }
+
+src_install() {
+	insinto "/opt/${MY_PN}"
+	doins "${MY_PN}.jar"
+
+	make_wrapper "${PN}" "java -jar /opt/${MY_PN}/${MY_PN}.jar"
+	make_desktop_entry "${PN}" "${MY_PN}" "${PN}" "Game;StrategyGame;"
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}

media-video/tartube/Manifest

@@ -1,2 +1,3 @@
 DIST tartube-2.0.0.tar.gz 1726296 BLAKE2B 7d0d0c83845ddc6717457ec3c0f701f818211680bc69cebfc246aba768379e9372786083444d9bfffcde0a382e84171532f7218580bcf93b62ab1e88a4859d88 SHA512 dd5126fb690a49c4cb7d937aa7abc2e6bbc9327eb1cf17fa9bcdbfe865e6a46be0cb7fcafe487ceebcd9c10f0436fd798836e5ed4cb520657777db25749ad403
 DIST tartube-2.1.0.tar.gz 3556615 BLAKE2B c94a4bc818eae077605bd2b6ebe20fedf1f195dd6aa8763976b31811a4739c7964b5373e0ed02ca848e12c06706f1fc3ca9a4f9a9f51721f1e4bb199007145fe SHA512 f08d40cb1c7082b47c6fd28105880d135a3750ef7a763b8bfd3e4d3852d224f23f41f835cfa18cc988b633ad6ea66eca284259fdde122c2753ba02579b13995c
+DIST tartube-2.2.007.tar.gz 3695147 BLAKE2B 010d54c44fe98ef7242206fd1f6bbf597d403585a93b2212d441aed2ac863f9743cbd44efe56bfd078954b5c609045254fe7c70269282bef32e14b020a7aad51 SHA512 96296dde1a632f034812a98ba56d67228b6ceb89b661d40e27d7ba2831ef59637745dfb58b31af42947ea55d9b1ba611ef5f2b180f1438fae07d1d60b9188aae

media-video/tartube/metadata.xml

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+    <maintainer type="person">
+        <email>xgqt@protonmail.com</email>
+        <name>Maciej Barć</name>
+    </maintainer>
     <use>
         <flag name="atomicparsley">Use AtomicParsley for embedding thumbnails in audio files</flag>
         <flag name="ffmpeg">Required for various video post-processing tasks</flag>

media-video/tartube/tartube-2.2.007.ebuild

@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit eutils xdg distutils-r1
+
+DESCRIPTION="A GUI front-end for youtube-dl"
+HOMEPAGE="https://tartube.sourceforge.io"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/axcore/${PN}.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/axcore/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+RESTRICT="mirror"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+atomicparsley +ffmpeg"
+
+RDEPEND="
+	dev-python/pygobject[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	net-misc/youtube-dl
+	x11-themes/adwaita-icon-theme
+	atomicparsley? (
+		media-video/atomicparsley
+	)
+	ffmpeg? (
+		media-video/ffmpeg
+	)
+"
+
+DOCS=(
+	AUTHORS
+	CHANGES
+	README.rst
+)
+
+src_prepare() {
+	export TARTUBE_PKG_STRICT=1
+
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	distutils-r1_src_install
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+
+	elog "You may need to set path to (system) youtube-dl"
+	elog "in Tartube's System preferences"
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}

net-firewall/hblock/metadata.xml

@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <upstream>
+    <maintainer type="person">
-    <remote-id type="github">hectorm/hblock</remote-id>
+        <email>xgqt@protonmail.com</email>
-  </upstream>
+        <name>Maciej Barć</name>
+    </maintainer>
+    <upstream>
+        <remote-id type="github">hectorm/hblock</remote-id>
+    </upstream>
 </pkgmetadata>