From f0795b5bee5ed152ff95327dc823b907848f275e Mon Sep 17 00:00:00 2001
From: miqlas <5569059+extrowerk@users.noreply.github.com>
Date: Mon, 9 Apr 2018 18:07:48 +0200
Subject: [PATCH] Otter: bump (#2421)

* Otter: bump

* SRC filename
---
 .../otter-browser/otter_browser-0.9.12.recipe | 104 ------------------
 .../otter-browser/otter_browser-0.9.93.recipe | 104 ------------------
 ....96.recipe => otter_browser-0.9.97.recipe} |   3 +-
 ...patchset => otter_browser-0.9.97.patchset} |   0
 4 files changed, 2 insertions(+), 209 deletions(-)
 delete mode 100644 www-client/otter-browser/otter_browser-0.9.12.recipe
 delete mode 100644 www-client/otter-browser/otter_browser-0.9.93.recipe
 rename www-client/otter-browser/{otter_browser-0.9.96.recipe => otter_browser-0.9.97.recipe} (95%)
 rename www-client/otter-browser/patches/{otter_browser-0.9.96.patchset => otter_browser-0.9.97.patchset} (100%)

diff --git a/www-client/otter-browser/otter_browser-0.9.12.recipe b/www-client/otter-browser/otter_browser-0.9.12.recipe
deleted file mode 100644
index bf896a413..000000000
--- a/www-client/otter-browser/otter_browser-0.9.12.recipe
+++ /dev/null
@@ -1,104 +0,0 @@
-SUMMARY="A lightweight QtWebKit browser"
-DESCRIPTION="Project aiming to recreate the best aspects of the \
-classic Opera (12.x) UI using Qt5."
-HOMEPAGE="https://otter-browser.org/"
-COPYRIGHT="2013-2017 Otter Browser Team"
-LICENSE="GNU GPL v3"
-REVISION="3"
-SOURCE_URI="https://github.com/OtterBrowser/otter-browser/archive/v$portVersion.tar.gz"
-CHECKSUM_SHA256="1a184561b9dbf3443cf1f83ad8604976b1b06cc00a93306331b364f237363e20"
-SOURCE_DIR="otter-browser-$portVersion"
-ADDITIONAL_FILES="otter.rdef.in"
-
-ARCHITECTURES="!x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="x86"
-
-PROVIDES="
-	otter_browser$secondaryArchSuffix = $portVersion
-	app:OtterBrowser$secondaryArchSuffix = $portVersion
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	lib:libcrypto$secondaryArchSuffix
-	lib:libhunspell_1.6$secondaryArchSuffix
-	lib:libQt5Core$secondaryArchSuffix
-	lib:libQt5DBus$secondaryArchSuffix
-	lib:libQt5Gui$secondaryArchSuffix
-	lib:libQt5Multimedia$secondaryArchSuffix
-	lib:libQt5Network$secondaryArchSuffix
-	lib:libQt5PrintSupport$secondaryArchSuffix
-	lib:libQt5Qml$secondaryArchSuffix
-	lib:libQt5WebKit$secondaryArchSuffix
-	lib:libQt5WebKitWidgets$secondaryArchSuffix
-	lib:libQt5Widgets$secondaryArchSuffix
-	lib:libQt5XmlPatterns$secondaryArchSuffix
-	lib:libssl$secondaryArchSuffix
-	"
-
-BUILD_PREREQUIRES="
-	cmd:cmake
-	cmd:make
-	cmd:g++$secondaryArchSuffix
-	cmd:pkg_config$secondaryArchSuffix
-	cmd:sed
-	"
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	devel:libcrypto$secondaryArchSuffix
-	devel:libhunspell_1.6$secondaryArchSuffix
-	devel:libQt5Core$secondaryArchSuffix
-	devel:libQt5DBus$secondaryArchSuffix
-	devel:libQt5Gui$secondaryArchSuffix
-	devel:libQt5Multimedia$secondaryArchSuffix
-	devel:libQt5Network$secondaryArchSuffix
-	devel:libQt5PrintSupport$secondaryArchSuffix
-	devel:libQt5Qml$secondaryArchSuffix
-	devel:libQt5WebKit$secondaryArchSuffix
-	devel:libQt5WebKitWidgets$secondaryArchSuffix
-	devel:libQt5Widgets$secondaryArchSuffix
-	devel:libQt5XmlPatterns$secondaryArchSuffix
-	devel:libssl$secondaryArchSuffix
-	"
-
-PATCH()
-{
-	sed --in-place '/install(FILES resources/d' CMakeLists.txt
-	sed --in-place '/install(FILES otter-browser.desktop/d' CMakeLists.txt
-}
-
-BUILD()
-{
-	mkdir -p build
-	cd build
-
-	cmake .. -DCMAKE_INSTALL_PREFIX:PATH="$appsDir/Otter-Browser"
-	make $jobArgs
-}
-
-INSTALL()
-{
-	cd build
-	make install
-
-	mv $appsDir/Otter-Browser/bin/otter-browser \
-		$appsDir/Otter-Browser/Otter-Browser
-
-	mkdir -p $manDir
-	mv $appsDir/Otter-Browser/share/man/man1 $manDir
-	rmdir $appsDir/Otter-Browser/bin || true
-	rmdir $appsDir/Otter-Browser/share/man/ || true
-
-	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
-	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
-	local MINOR="`echo "$portVersion" | cut -d. -f3`"
-	sed \
-		-e "s|@MAJOR@|$MAJOR|" \
-		-e "s|@MIDDLE@|$MIDDLE|" \
-		-e "s|@MINOR@|$MINOR|" \
-		$portDir/additional-files/otter.rdef.in > otter.rdef
-
-	addResourcesToBinaries otter.rdef \
-		$appsDir/Otter-Browser/Otter-Browser
-
-	addAppDeskbarSymlink $appsDir/Otter-Browser/Otter-Browser "Otter Browser"
-}
diff --git a/www-client/otter-browser/otter_browser-0.9.93.recipe b/www-client/otter-browser/otter_browser-0.9.93.recipe
deleted file mode 100644
index 33b72c507..000000000
--- a/www-client/otter-browser/otter_browser-0.9.93.recipe
+++ /dev/null
@@ -1,104 +0,0 @@
-SUMMARY="A lightweight QtWebKit browser"
-DESCRIPTION="Project aiming to recreate the best aspects of the \
-classic Opera (12.x) UI using Qt5."
-HOMEPAGE="https://otter-browser.org/"
-COPYRIGHT="2013-2017 Otter Browser Team"
-LICENSE="GNU GPL v3"
-REVISION="1"
-SOURCE_URI="https://github.com/OtterBrowser/otter-browser/archive/v$portVersion.tar.gz"
-CHECKSUM_SHA256="b0f14132fce8265b74ff14ce19ed9f4848e5c5a4bd3f28ca1db2264591777a7d"
-SOURCE_DIR="otter-browser-$portVersion"
-ADDITIONAL_FILES="otter.rdef.in"
-
-ARCHITECTURES="!x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="x86"
-
-PROVIDES="
-	otter_browser$secondaryArchSuffix = $portVersion
-	app:OtterBrowser$secondaryArchSuffix = $portVersion
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	lib:libcrypto$secondaryArchSuffix
-	lib:libhunspell_1.6$secondaryArchSuffix
-	lib:libQt5Core$secondaryArchSuffix
-	lib:libQt5DBus$secondaryArchSuffix
-	lib:libQt5Gui$secondaryArchSuffix
-	lib:libQt5Multimedia$secondaryArchSuffix
-	lib:libQt5Network$secondaryArchSuffix
-	lib:libQt5PrintSupport$secondaryArchSuffix
-	lib:libQt5Qml$secondaryArchSuffix
-	lib:libQt5WebKit$secondaryArchSuffix
-	lib:libQt5WebKitWidgets$secondaryArchSuffix
-	lib:libQt5Widgets$secondaryArchSuffix
-	lib:libQt5XmlPatterns$secondaryArchSuffix
-	lib:libssl$secondaryArchSuffix
-	"
-
-BUILD_PREREQUIRES="
-	cmd:cmake
-	cmd:make
-	cmd:g++$secondaryArchSuffix
-	cmd:pkg_config$secondaryArchSuffix
-	cmd:sed
-	"
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	devel:libcrypto$secondaryArchSuffix
-	devel:libhunspell_1.6$secondaryArchSuffix
-	devel:libQt5Core$secondaryArchSuffix
-	devel:libQt5DBus$secondaryArchSuffix
-	devel:libQt5Gui$secondaryArchSuffix
-	devel:libQt5Multimedia$secondaryArchSuffix
-	devel:libQt5Network$secondaryArchSuffix
-	devel:libQt5PrintSupport$secondaryArchSuffix
-	devel:libQt5Qml$secondaryArchSuffix
-	devel:libQt5WebKit$secondaryArchSuffix
-	devel:libQt5WebKitWidgets$secondaryArchSuffix
-	devel:libQt5Widgets$secondaryArchSuffix
-	devel:libQt5XmlPatterns$secondaryArchSuffix
-	devel:libssl$secondaryArchSuffix
-	"
-
-PATCH()
-{
-	sed --in-place '/install(FILES resources/d' CMakeLists.txt
-	sed --in-place '/install(FILES otter-browser.desktop/d' CMakeLists.txt
-}
-
-BUILD()
-{
-	mkdir -p build
-	cd build
-
-	cmake .. -DCMAKE_INSTALL_PREFIX:PATH="$appsDir/Otter-Browser"
-	make $jobArgs
-}
-
-INSTALL()
-{
-	cd build
-	make install
-
-	mv $appsDir/Otter-Browser/bin/otter-browser \
-		$appsDir/Otter-Browser/Otter-Browser
-
-	mkdir -p $manDir
-	mv $appsDir/Otter-Browser/share/man/man1 $manDir
-	rmdir $appsDir/Otter-Browser/bin || true
-	rmdir $appsDir/Otter-Browser/share/man/ || true
-
-	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
-	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
-	local MINOR="`echo "$portVersion" | cut -d. -f3`"
-	sed \
-		-e "s|@MAJOR@|$MAJOR|" \
-		-e "s|@MIDDLE@|$MIDDLE|" \
-		-e "s|@MINOR@|$MINOR|" \
-		$portDir/additional-files/otter.rdef.in > otter.rdef
-
-	addResourcesToBinaries otter.rdef \
-		$appsDir/Otter-Browser/Otter-Browser
-
-	addAppDeskbarSymlink $appsDir/Otter-Browser/Otter-Browser "Otter Browser"
-}
diff --git a/www-client/otter-browser/otter_browser-0.9.96.recipe b/www-client/otter-browser/otter_browser-0.9.97.recipe
similarity index 95%
rename from www-client/otter-browser/otter_browser-0.9.96.recipe
rename to www-client/otter-browser/otter_browser-0.9.97.recipe
index b7cf444fb..0684f45a3 100644
--- a/www-client/otter-browser/otter_browser-0.9.96.recipe
+++ b/www-client/otter-browser/otter_browser-0.9.97.recipe
@@ -6,7 +6,8 @@ COPYRIGHT="2013-2018 Otter Browser Team"
 LICENSE="GNU GPL v3"
 REVISION="1"
 SOURCE_URI="https://github.com/OtterBrowser/otter-browser/archive/v$portVersion.tar.gz"
-CHECKSUM_SHA256="3a3c971508a549579fbe83a94c1892c42296a3bd3e5209a035698ae03205c48d"
+CHECKSUM_SHA256="29ed9b6545c0646ff4369db54093de92a49b0ab9f83815eee3233909a44a0185"
+SOURCE_FILENAME="otter-browser-$portVersion.tar.gz
 SOURCE_DIR="otter-browser-$portVersion"
 PATCHES="otter_browser-$portVersion.patchset"
 ADDITIONAL_FILES="otter.rdef.in"
diff --git a/www-client/otter-browser/patches/otter_browser-0.9.96.patchset b/www-client/otter-browser/patches/otter_browser-0.9.97.patchset
similarity index 100%
rename from www-client/otter-browser/patches/otter_browser-0.9.96.patchset
rename to www-client/otter-browser/patches/otter_browser-0.9.97.patchset