gentoo resync : 26.11.2017

4 files changed, 4 insertions, 88 deletions

diff --git a/dev-db/sqliteman/Manifest b/dev-db/sqliteman/Manifest
index 42d63ae85c1c..b2fedd5b5fd9 100644
--- a/dev-db/sqliteman/Manifest
+++ b/dev-db/sqliteman/Manifest
@@ -1,10 +1,5 @@
-AUX sqliteman-1.2.2-lpthread.patch 486 SHA256 af99d278b6d0cda9f84487985afdb427f77edd6eff9a1a62edac906dcfd5487b SHA512 e4598b7f74da7c046571a5b6744d172a9d5d8d35c28ff0bd11b0db68a3fa8ba291ab9634a3622ea5aa383fe6aff75318350665a0a75f68224b6ba97cbc8f3855 WHIRLPOOL 63858a7eb84bdc51ae13d41e1c20c0a29f0b88b853a29560f895b197881acaa9fe3456ef13f585d6746489760c48c5ad05b6f238faf57d1e554f83c0bed762ff
-AUX sqliteman-1.2.2-qscintilla-2.10.patch 587 SHA256 572ba772bfe151f3f5bc85e21bea645da84aeecc2a91272ff9b3c4dcb6a94fed SHA512 91af0f16af6c0d686d3e184518262de123bb998fc4802108645b15b3288c8aa242a869dec99c350cdfa9982420f4989e54d8287e9c387073361e2bdcf1310472 WHIRLPOOL 93bf44bac8433293d9a20b452fa4324a9a4519fba0eb7b9d0120a5d40e96777c55fe026b827c9b80125f988f95cdf391172f73acccdc4b9db7cff0efd8e6e438
-AUX sqliteman-1.2.2-qt5.patch 11317 SHA256 5cd44c0b5e4387758b3c485365ed97f2f766b69fff893d89767a19eda800f0ff SHA512 5169991a0b764fe02782dcc94befe1479bcae631f815c268c9e2a3f02c8efbaceb78ecb87d04eea240623fdfcc475b6b91149a4461974f648f4dea62ba07e309 WHIRLPOOL 2e9832bb24741e3866a6f3c7bd620e88bd45624717a1c6132177d693137b0f9de49e73731fe0eac32c73deae2333fedcdf015347bd840db69257220e48410273
+AUX sqliteman-1.2.2-lpthread.patch 486 BLAKE2B 4918962f3369880750e366fdfd8ae2a4a7750bcda76dd86476c8cfbf7bcada4fd46fe9da7156724fbc198abe616bc7687dc7016f89c192ef2aa722567dcb7292 SHA512 e4598b7f74da7c046571a5b6744d172a9d5d8d35c28ff0bd11b0db68a3fa8ba291ab9634a3622ea5aa383fe6aff75318350665a0a75f68224b6ba97cbc8f3855
+AUX sqliteman-1.2.2-qt5.patch 11317 BLAKE2B 0fb2f1afca7d4c2cc443a29c7f5c4b1babdeea2025bb4811052d98bfb26f5ee241e58c99830fa820d07ed5a03d2cc264ebab532c872cbb622f4ed65e6e99174f SHA512 5169991a0b764fe02782dcc94befe1479bcae631f815c268c9e2a3f02c8efbaceb78ecb87d04eea240623fdfcc475b6b91149a4461974f648f4dea62ba07e309
 DIST sqliteman-1.2.2.tar.gz 1579855 SHA256 2229e627528ec02a9cf7aba3a65bef8999272fc25eb22112dc3f8ee583eb5dfb SHA512 ada8315247723c6cbb9a4c235ce427aed3fcbe6f4edaa3ee2f9c31c1729d71a4bfc874bb7ca561f2a2c9afad092e2f90c7871646eccecb3e71bcd50d1164faf4 WHIRLPOOL 73f6bee7a98e46ef6e76dca086f6cd9379f3f7c8574df70f92d21ac68def0aef548350877eda319d7bedd6b34f5f128db839ef1b2c583a7ad5565a4a78a42d6c
-EBUILD sqliteman-1.2.2-r2.ebuild 659 SHA256 e5a7d0189a76a303a23cec6b1735d3b02e4c1fc13942f4994734e0ae0788bc36 SHA512 56a3746bef61c5a750c2c7fff27dc02f1a535b9ca2ffadacf864753a49ea52444eaac22c7dc26464e07b034f0056167cdaf56d3a6b70d6d72ecde02137bcecaf WHIRLPOOL 916799ba2a35ec622ceeb02c0eb2c7cb30fbe9b7aa20d6bf0b6615f15e54a1c1bd1acd81ee1ba866d0ec3608f2ffc61a6d65480b25b2b2ffebe61e841da75c0f
-EBUILD sqliteman-1.2.2-r3.ebuild 680 SHA256 6ebd8e39aa81c95bdc65e6f03a6975d71ca82eaca9886bef91a66e8b9a8305f1 SHA512 24abd2d29b5740f05eba51b3663ae77691df586cd07f313273902445a6381d809b26a2694017aa2d6374efe5f186d7b97737c9d012ed4db9a6cb149592a85c91 WHIRLPOOL 0ac27daceb409f7e72d9104850762335903adb98d530e8ac9acf2c9edaca1a3f3622dbd74d9c1e59e80bdb49afa33acaca73d48612ff1aef8eb13ac2c356e4db
-EBUILD sqliteman-1.2.2-r4.ebuild 894 SHA256 a7f744cfdf6d5a01a70f14859ecd0f93319b7512207201955488f7c34f9bf6f8 SHA512 a13fc0d37d1bdc2598b3a2cc8cc9c00f71ad720c71c6406259904120e162f9ace760a4fbf4c15b0bb0eab73a0ce4a73620bf43e07315c4169893b6140a8fe539 WHIRLPOOL e9fb015aa6734724b24d4897170c9618af4cdd2f5624422efadefb98f76637108b34f4cdde45af62ee903684dab4ccbf99e2a1a1794fb206246cb947f717ba21
-MISC ChangeLog 3476 SHA256 c9ddffe6aefd0b0f18bd6f93b98bd254d7f728ad9a5f768d5d1ac3bc745ee91a SHA512 fa7ccff18dd334d20a636783b8395d95e27b46dbd401f3a5e64d9e9e90c0dcaf12ef2a8fcb858fd07565dcc97566b42e5b908f1c09d433849b048cbab9fb5d1d WHIRLPOOL b91a6800f13796d66b784266b000b990960b2fdb1c00d08fb3b44f13b49092463a504ee742d222aed4bb2957a9a5d32036f55a04f30908753aa9e0b0b4882916
-MISC ChangeLog-2015 1667 SHA256 ba16bedc2ba55ac810300de58f2f3fea81b5eef5e4a8c467323200e3c94c4290 SHA512 1199bc0c7acb74d0000105d69acf448bbac9f4e40999e3adf6a28343f3d17318e606183ac5bb5fee3667237442571aa48499c17f6e63aa1d4f69cf872fcc68d4 WHIRLPOOL 11b650bfaa1dd418ac08fea148b71a7f31db899fb7ecf34b5a9e286bc9c54d0258de98b330c29144b051aa66cb63ad58ad28971fd4d994ce39d99e1f48e005d1
-MISC metadata.xml 326 SHA256 e5809cdedbb1bf2d8c70f0df907f780c75d89412b8bb19cbf464bb7a70c681c6 SHA512 28cfd089b3652e0bc89c32cffa6bc3c6a10dc84ac786db5de65155ef2752982fd167f5a916f1738848e1bce5ed86d335f463187ad532db06e90d5ce6492f4d53 WHIRLPOOL 142f8b039fc64b663505b4f53d50a0109203cae21914c3df67e1dc9260197b43063c9550010aa5421faf35c31902f599df41aa48dbbefe3a4990d5fa9586a306
+EBUILD sqliteman-1.2.2-r4.ebuild 894 BLAKE2B 0e8af0bf8b9a3e1fea44197371f181116905fe20428c86196fe00fc34bca752e9942fb6e568f08d9da3e524859706afcc3e32facaf9d1ad760c74dfdc8f6c67a SHA512 a13fc0d37d1bdc2598b3a2cc8cc9c00f71ad720c71c6406259904120e162f9ace760a4fbf4c15b0bb0eab73a0ce4a73620bf43e07315c4169893b6140a8fe539
+MISC metadata.xml 326 BLAKE2B 3222161899430f7576736aadb193fad5e74ac0a0223ecc14a4b062b882192ecd24e2695314a85d4b416009798887c3a2c969c7f2021835ac7bdf390c2d24b46b SHA512 28cfd089b3652e0bc89c32cffa6bc3c6a10dc84ac786db5de65155ef2752982fd167f5a916f1738848e1bce5ed86d335f463187ad532db06e90d5ce6492f4d53
diff --git a/dev-db/sqliteman/files/sqliteman-1.2.2-qscintilla-2.10.patch b/dev-db/sqliteman/files/sqliteman-1.2.2-qscintilla-2.10.patch
deleted file mode 100644
index c197ad342111..000000000000
--- a/dev-db/sqliteman/files/sqliteman-1.2.2-qscintilla-2.10.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cmake/modules/FindQScintilla.cmake b/cmake/modules/FindQScintilla.cmake
-index c4592d0..7700ec4 100644
---- a/cmake/modules/FindQScintilla.cmake
-+++ b/cmake/modules/FindQScintilla.cmake
-@@ -21,7 +21,7 @@ IF(QT4_FOUND)
-     "${QT_INCLUDE_DIR}/Qsci" /usr/include /usr/include/Qsci
-     )
- 
--    SET(QSCINTILLA_NAMES ${QSCINTILLA_NAMES} qscintilla2 libqscintilla2)
-+    SET(QSCINTILLA_NAMES ${QSCINTILLA_NAMES} qscintilla2 libqscintilla2 qscintilla2_qt4 libqscintilla2_qt4)
-     FIND_LIBRARY(QSCINTILLA_LIBRARY
-         NAMES ${QSCINTILLA_NAMES}
-         PATHS ${QT_LIBRARY_DIR}
diff --git a/dev-db/sqliteman/sqliteman-1.2.2-r2.ebuild b/dev-db/sqliteman/sqliteman-1.2.2-r2.ebuild
deleted file mode 100644
index 0550f0f6afa4..000000000000
--- a/dev-db/sqliteman/sqliteman-1.2.2-r2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="Powerful GUI manager for the Sqlite3 database"
-HOMEPAGE="https://sourceforge.net/projects/sqliteman/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtsql:4[sqlite]
-	x11-libs/qscintilla:=[qt4(-)]"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS README )
-PATCHES=( "${FILESDIR}/${P}-lpthread.patch" )
-
-src_prepare() {
-	# remove bundled lib
-	rm -rf "${S}"/${PN}/qscintilla2 || die
-
-	cmake-utils_src_prepare
-}
diff --git a/dev-db/sqliteman/sqliteman-1.2.2-r3.ebuild b/dev-db/sqliteman/sqliteman-1.2.2-r3.ebuild
deleted file mode 100644
index e591dfbd957f..000000000000
--- a/dev-db/sqliteman/sqliteman-1.2.2-r3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Powerful GUI manager for the Sqlite3 database"
-HOMEPAGE="https://sourceforge.net/projects/sqliteman/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtsql:4[sqlite]
-	x11-libs/qscintilla:=[qt4(-)]"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-lpthread.patch"
-	"${FILESDIR}/${P}-qscintilla-2.10.patch"
-)
-
-src_prepare() {
-	# remove bundled lib
-	rm -rf "${S}"/${PN}/qscintilla2 || die
-
-	cmake-utils_src_prepare
-}