gentoo resync : 15.01.2020

3 files changed, 55 insertions, 5 deletions

diff --git a/media-video/bashnapi/Manifest b/media-video/bashnapi/Manifest
index 29cb634e6a75..c62b8e76830b 100644
--- a/media-video/bashnapi/Manifest
+++ b/media-video/bashnapi/Manifest
@@ -1,3 +1,5 @@
 DIST bashnapi_v1.3.5.tar.gz 98580 BLAKE2B 4a7b42f91c14c7dc24cbf14535700a778d915db0dec31206cd7bb91519f33aa4eedced56aa4efa136e3eef23f6674d1a7dafe6c63686aca4dccf076952da762d SHA512 7cf5abb009021a43261be863f320d6324b02ea25f1388c7cc99a4f695a3eb987971ada172f74d21e3a44deeec35e48c4424fa378de53749f994b6c0d0f76eec8
-EBUILD bashnapi-1.3.5.ebuild 1191 BLAKE2B 9de6ff32cad26dcb7af6bb5887e92319173a60607a928aaf99ae88488e22f332b9c7bbaf4da683d9fe97d2722a52aec19e8cd8415cf0a6889e3f60260aedca5e SHA512 7eaea6de7b4ef121ea70faff2c76ee963c0f76af9ca9440cffd7eea5c86bd6bb2129eeda6b9f56250e15e7a616c5be20a9c4ae589f92dae60bcabadcde7260dc
+DIST napi-2.0.0.tar.gz 104326 BLAKE2B f7fbea40bfbcadbefa44b31ca4689a4ce4470abf715fc7c38f2b06c911cd8a32f8dcf0ae605cdf6bb9afb00b64ae1bbb468ad02e094c3e4d272745177c5ae6e7 SHA512 fc64d8d815c2014e04115623099351226a66268c2b414fa3cee37fd73f4e6a84f41cc57e96184d9f30e72e84ba98f886be45e68b4c9d3c774c874ea40bc6c2b7
+EBUILD bashnapi-1.3.5.ebuild 1122 BLAKE2B d8b0619f91949ffab1781553a9d835b90e8d7c2412e6f0a35cb7ce8241749f5de85878fda067d5e1fbc6aa1448e4c6d943da872f935d9f4e0d89044534650348 SHA512 bec66dd3d47eb4ce7459ad84959d52b0fefb5aabdea312d291b364698e84bc8401d6f25081030c712f14842b19c3c446ef72ac7de6033a77e6db6eded7bc3839
+EBUILD bashnapi-2.0.0.ebuild 979 BLAKE2B 0d455073411ff5787650a09f87be62101300d45530992a46372144393735a15bd169e98a1501dd662576051dc109c6b5ecba587b1ff438ba74e725f4fc001221 SHA512 153173946af9522e44bdb173ca47363270095c3664999c456a850db157453fa927eaf51e0cb7983104bfa3c7a69fb377ed0310e8ac03a3daa6b1157a22cc9959
 MISC metadata.xml 325 BLAKE2B d80d1433192e99fcf314cee37c43606d74f771b7975fe0bea47610268a4cf616fe1f25ddd647b85f7b3bec4829fd268938a8cbae25596902ae589483c56b8a88 SHA512 93311c8909919558e542db42c144d361ee0289e4c61fa2d49508941f1aa93e307fc6f9a6afce008e3fe54a964cfe35b7774fb94eca405cd4dabba8aa9cb80732
diff --git a/media-video/bashnapi/bashnapi-1.3.5.ebuild b/media-video/bashnapi/bashnapi-1.3.5.ebuild
index 9671be6e2615..993294be32e4 100644
--- a/media-video/bashnapi/bashnapi-1.3.5.ebuild
+++ b/media-video/bashnapi/bashnapi-1.3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,9 +12,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-# subotage is now integrated into bashnapi
-RDEPEND="app-arch/p7zip
-	!media-video/subotage"
+RDEPEND="app-arch/p7zip"
 
 S=${WORKDIR}/napi-${PV}
 
diff --git a/media-video/bashnapi/bashnapi-2.0.0.ebuild b/media-video/bashnapi/bashnapi-2.0.0.ebuild
new file mode 100644
index 000000000000..00ed00435858
--- /dev/null
+++ b/media-video/bashnapi/bashnapi-2.0.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+MY_P=napi-${PV}
+DESCRIPTION="Napiprojekt.pl subtitle downloader in bash"
+HOMEPAGE="https://sourceforge.net/projects/bashnapi/"
+SRC_URI="https://download.sourceforge.net/bashnapi/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-arch/p7zip
+	net-misc/wget
+	sys-apps/debianutils
+	sys-apps/file"
+
+# tests are normally run via docker
+RESTRICT="test"
+
+pkg_postinst() {
+	# packages that can be used to detect FPS
+	local fps_pkgs=(
+		media-video/ffmpeg
+		media-video/mediainfo
+		media-video/mplayer
+		# also mplayer2
+	)
+	local p found
+
+	for p in "${fps_pkgs[@]}"; do
+		if has_version "${p}"; then
+			found=1
+			break
+		fi
+	done
+
+	if [[ ! ${found} ]]; then
+		elog "In order to support FPS detection, install one of the following packages:"
+		elog
+		for p in "${fps_pkgs[@]}"; do
+			elog "  ${p}"
+		done
+	fi
+}