gentoo resync : 10.01.2018

6 files changed, 101 insertions, 107 deletions

diff --git a/media-gfx/converseen/Manifest b/media-gfx/converseen/Manifest
index 8c1f5359be11..76d26d3aa987 100644
--- a/media-gfx/converseen/Manifest
+++ b/media-gfx/converseen/Manifest
@@ -1,5 +1,4 @@
-DIST converseen-0.6.4.tar.bz2 223060 BLAKE2B 94b0aa1bd629f3421ddf0eac9ee98c927cb4a12a6bd1e4df14a37f6fd5f3439562188b53f2c4e0ba4d7cda5cd7800f89216380d02b576b2dcdf9fd4cd601dcdc SHA512 432403cf13bb5eb1b6d0438775379295e05b250902c259bf0117efea7e21d1768cb0fe4fb8ed9bffcdca4b055a5b95612fb5e3c24b3061813b10b6db736314a9
-DIST converseen-0.6.8.tar.bz2 226559 BLAKE2B e0df4901835aa928a502cc586cbcf1ffcfa44c6935d0223b8a8075ebe9c137c0527badd03919d7dec89ed3b706d6bdc691f8c4c173c1e3e70d7def70f643c9b0 SHA512 add32cb213a708f5311a7b885a2f50333c9cc1b83fc08a4e4e836882eabcf7ce170e514b2de08cc6b66c1680873ed65f774bcb62c7f69c55ba061c37bbab2836
-EBUILD converseen-0.6.4-r1.ebuild 1186 BLAKE2B 0f6eb0a8d3befee06978ba0f5a1f37877e6da3d5bab444ebc266c465d034a32108a90938c2cf41247b43137f861fe425ab0ae2f47154b1dc55fe8919611af052 SHA512 47cd56b54a61c3c485c10df6f66331ec72ca4e3f83955b921112da684ae450a3e84c7ddb64f2379c4c0f818bf57d2154c97164d488cc5b49bc43ee02d25ae72c
-EBUILD converseen-0.6.8-r1.ebuild 1209 BLAKE2B 7c3430a1c02d6e21496533cb67585cfa16c840b746f3d008c36ed2b2af4c4bb62ebf8dbd128e5aa803ab1069adadf90f0dfa41796355655a6432fc858a64b3f7 SHA512 62dc4f994dd276745d2bd4aa1620c574d19ccad94944e43361e762e9e3f5a2a8152d82c2700be90cfa1697162ea91d332b5b13b2376cb55656087e4c6a2901bc
-MISC metadata.xml 329 BLAKE2B 82634e9abc63106a9ebaf38a622081fbaa126d16d1d9804429eb892e4434956d8276df5740590146f888cb59c05812ab2a4b09dc9505ee072454a3e3c2b97382 SHA512 860c27750ae06a87f0400fd7b12a92150cc00d4d25767a2b8c8b49640d17b1f7124b523905352ad5f76a2df1746d92706c26d6f882576e27cfec411d5eeafcd6
+AUX converseen-0.9.6.2-gnuinstalldirs.patch 4784 BLAKE2B 245c5ddeff91bf4e1c74471cd8a9f3c93bf786e5c44c48b62560cdc34913aeb97b5392355421ba19e42074547a81f0a471899e19dab7294434b37b9f6ab8e0df SHA512 9e5abc254e1a1d1b2a92d5ba04f24640b90ea49f79222ed81c83fedb0f007adcffb371952db6074c18b3d1d853f81de21f45a3803df2b7fc4b18dc93ee7ab5e8
+DIST converseen-0.9.6.2.tar.gz 276879 BLAKE2B 3f41c8a85d275b2a2fb1c2c8971f92e447b0c7b236d5b90a07629400925b8627e1e9e837239e2114cd2e6f755941b4ef28adfbecf9813963d01b925af4e348e0 SHA512 897bcb4554ca05d92dc939837f74022fcc21e05273cb40445c0d02ce3e10e87f9e74eeccee69e4ed1bdf63ca3bd759d4d51769daee5ea34df7997114c7937f7c
+EBUILD converseen-0.9.6.2.ebuild 798 BLAKE2B ccac8901c9e063b0191e94083bf0299a67bd04d8389c73f30ab8b497f78148b68518f3d4b2c55dcef8f70e5eee4d7aed093eefafe05d4a1de8f3fb18a977cbee SHA512 da05e793225b69d19d98ab25556292d80219b5373a5961eb4ce441f0a6a4761cf94896b750550de2a046595ad9fceb8e53e19cdc754d32e5851b3c8eb3d8a817
+MISC metadata.xml 334 BLAKE2B 75ac31ec358abda09eefe2bea57dcadff35302bfcfbd7685ce32a9992681ded21a660629c355360453dbc14fea71dbc0cb8b714e3657133a10735b5c5c3b6194 SHA512 a3e94bb442843d6f05bfb03940d4c9fcc5b8e8d81d2f413ee60bf88e2e893d1cb00ea7c625289e1e12690d2fa9e2d1a1c9b6509665bb4a46c3b5121673381546
diff --git a/media-gfx/converseen/converseen-0.6.4-r1.ebuild b/media-gfx/converseen/converseen-0.6.4-r1.ebuild
deleted file mode 100644
index f991f2a22381..000000000000
--- a/media-gfx/converseen/converseen-0.6.4-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-LANGSLONG="cs_CZ de_DE fr_FR hu_HU it_IT pl_PL pt_BR ru_RU tr_TR"
-LANGS="es_CL"
-
-inherit cmake-utils
-
-DESCRIPTION="Batch image converter and resizer based on ImageMagick"
-HOMEPAGE="http://converseen.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-for x in ${LANGS}; do
-	IUSE="${IUSE} linguas_${x}"
-done
-for x in ${LANGSLONG}; do
-	IUSE="${IUSE} linguas_${x%_*}"
-done
-
-# FIXME: graphicsmagick dependency does not work properly, failures when compiling
-#	|| ( media-gfx/imagemagick[cxx] media-gfx/graphicsmagick[cxx,imagemagick] )
-RDEPEND="
-	dev-qt/qtgui:4
-	media-gfx/imagemagick:=[cxx]
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( README.md )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	for x in ${LANGSLONG}; do
-		if use !linguas_${x%_*}; then
-			rm -f "loc/${PN}_${x}."* || die
-			sed -i -e "\,/${PN}_${x}\...,d" CMakeLists.txt || die
-		fi
-	done
-	for x in ${LANGS}; do
-		if use !linguas_${x}; then
-			rm -f "loc/${PN}_${x}."* || die
-			sed -i -e "\,/${PN}_${x}\...,d" CMakeLists.txt || die
-		fi
-	done
-}
diff --git a/media-gfx/converseen/converseen-0.6.8-r1.ebuild b/media-gfx/converseen/converseen-0.6.8-r1.ebuild
deleted file mode 100644
index 3d335da5513f..000000000000
--- a/media-gfx/converseen/converseen-0.6.8-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-LANGSLONG="cs_CZ de_DE fr_FR hu_HU it_IT ja_JP pl_PL pt_BR ru_RU tr_TR"
-LANGS="es_CL"
-
-inherit cmake-utils
-
-DESCRIPTION="Batch image converter and resizer based on ImageMagick"
-HOMEPAGE="http://converseen.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-for x in ${LANGS}; do
-	IUSE="${IUSE} linguas_${x}"
-done
-for x in ${LANGSLONG}; do
-	IUSE="${IUSE} linguas_${x%_*}"
-done
-
-# FIXME: graphicsmagick dependency does not work properly, failures when compiling
-#	|| ( media-gfx/imagemagick[cxx] media-gfx/graphicsmagick[cxx,imagemagick] )
-RDEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	media-gfx/imagemagick:=[cxx]
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( README.md )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	for x in ${LANGSLONG}; do
-		if use !linguas_${x%_*}; then
-			rm -f "loc/${PN}_${x}."* || die
-			sed -i -e "\,/${PN}_${x}\...,d" CMakeLists.txt || die
-		fi
-	done
-	for x in ${LANGS}; do
-		if use !linguas_${x}; then
-			rm -f "loc/${PN}_${x}."* || die
-			sed -i -e "\,/${PN}_${x}\...,d" CMakeLists.txt || die
-		fi
-	done
-}
diff --git a/media-gfx/converseen/converseen-0.9.6.2.ebuild b/media-gfx/converseen/converseen-0.9.6.2.ebuild
new file mode 100644
index 000000000000..803e1a01e295
--- /dev/null
+++ b/media-gfx/converseen/converseen-0.9.6.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Batch image converter and resizer based on ImageMagick"
+HOMEPAGE="http://converseen.fasterland.net/"
+SRC_URI="https://github.com/Faster3ck/Converseen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+# FIXME: graphicsmagick dependency does not work properly, failures when compiling
+#	|| ( media-gfx/imagemagick[cxx] media-gfx/graphicsmagick[cxx,imagemagick] )
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	media-gfx/imagemagick:=[cxx]
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+
+S="${WORKDIR}/${P^}"
+
+PATCHES=( "${FILESDIR}/${P}-gnuinstalldirs.patch" )
diff --git a/media-gfx/converseen/files/converseen-0.9.6.2-gnuinstalldirs.patch b/media-gfx/converseen/files/converseen-0.9.6.2-gnuinstalldirs.patch
new file mode 100644
index 000000000000..3b53d056948c
--- /dev/null
+++ b/media-gfx/converseen/files/converseen-0.9.6.2-gnuinstalldirs.patch
@@ -0,0 +1,64 @@
+From ba62e29b7739c96ad073a7c14d4fdb5883dbe94c Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Tue, 9 Jan 2018 02:06:09 +0100
+Subject: [PATCH] Use GNUInstalldirs
+
+No need to reinvent the wheel, make use of standards provided by cmake.
+---
+ CMakeLists.txt | 36 +++++++++++++++++++-----------------
+ 1 file changed, 19 insertions(+), 17 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a944102..de5e556 100755
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -5,6 +5,8 @@ cmake_minimum_required(VERSION 2.6)
+ SET(GUI "converseen")  

+ SET(QT_USE_QTNETWORK TRUE)

+ 

++include(GNUInstallDirs)

++

+ ADD_DEFINITIONS( ${OPTIMIZATION_FLAGS} )

+   

+ SET(converseen_UIS  

+@@ -129,20 +131,20 @@ ADD_EXECUTABLE(${GUI}
+   

+ TARGET_LINK_LIBRARIES(${GUI} ${Qt5Network_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${ImageMagick_LIBRARY} ${ImageMagick_Magick++_LIBRARY} ${ImageMagick_MagickCore_LIBRARY})

+ 

+-install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/converseen DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)

+-install(FILES res/converseen.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)

+-install(FILES res/converseen.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps)

+-install(FILES res/converseen_import.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kservices5/ServiceMenus)

+-install(FILES converseen.appdata.xml DESTINATION /usr/share/appdata/)

+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_cs_CZ.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)

+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_de_DE.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)

+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_es_CL.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)

+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_fr_FR.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)

+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_hu_HU.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)

+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_it_IT.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)

+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_pt_BR.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)

+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_tr_TR.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)

+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_ru_RU.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)

+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_pl_PL.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)

+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_ja_JP.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)

+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_da_DK.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)

++install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/converseen DESTINATION ${CMAKE_INSTALL_BINDIR})

++install(FILES res/converseen.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)

++install(FILES res/converseen.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pixmaps)

++install(FILES res/converseen_import.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/kservices5/ServiceMenus)

++install(FILES converseen.appdata.xml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/appdata/)

++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_cs_CZ.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)

++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_de_DE.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)

++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_es_CL.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)

++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_fr_FR.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)

++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_hu_HU.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)

++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_it_IT.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)

++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_pt_BR.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)

++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_tr_TR.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)

++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_ru_RU.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)

++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_pl_PL.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)

++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_ja_JP.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)

++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_da_DK.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)

+-- 
+2.15.1
+
diff --git a/media-gfx/converseen/metadata.xml b/media-gfx/converseen/metadata.xml
index 04b9e1a50d50..4716a6592192 100644
--- a/media-gfx/converseen/metadata.xml
+++ b/media-gfx/converseen/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Maxim Koltsov</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge">converseen</remote-id>
+		<remote-id type="github">Faster3ck/Converseen</remote-id>
 	</upstream>
 </pkgmetadata>