From 1798c4aeca70ac8d0a243684d6a798fbc65735f8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:57:42 +0100 Subject: gentoo resync : 14.07.2018 --- dev-db/sqlitebrowser/Manifest | 8 -- .../files/sqlitebrowser-3.10.1-unbundle.patch | 105 --------------------- .../files/sqlitebrowser-3.7.0-unbundle.patch | 18 ---- .../files/sqlitebrowser-3.9.1-cmake.patch | 24 ----- dev-db/sqlitebrowser/metadata.xml | 18 ---- dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild | 68 ------------- dev-db/sqlitebrowser/sqlitebrowser-3.9.1-r1.ebuild | 71 -------------- 7 files changed, 312 deletions(-) delete mode 100644 dev-db/sqlitebrowser/Manifest delete mode 100644 dev-db/sqlitebrowser/files/sqlitebrowser-3.10.1-unbundle.patch delete mode 100644 dev-db/sqlitebrowser/files/sqlitebrowser-3.7.0-unbundle.patch delete mode 100644 dev-db/sqlitebrowser/files/sqlitebrowser-3.9.1-cmake.patch delete mode 100644 dev-db/sqlitebrowser/metadata.xml delete mode 100644 dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild delete mode 100644 dev-db/sqlitebrowser/sqlitebrowser-3.9.1-r1.ebuild (limited to 'dev-db/sqlitebrowser') diff --git a/dev-db/sqlitebrowser/Manifest b/dev-db/sqlitebrowser/Manifest deleted file mode 100644 index 9cc37817da14..000000000000 --- a/dev-db/sqlitebrowser/Manifest +++ /dev/null @@ -1,8 +0,0 @@ -AUX sqlitebrowser-3.10.1-unbundle.patch 3313 BLAKE2B 91dda803cb2eed55a56568f4d2cc0519b33b59447fcdfee49705aa0bfce84009092b0e73ab0ae79b03fc30f20220b1ca8cebbd83b66d1f8fdd36c47669403019 SHA512 71b758dc1f412b1ed5d778e8ca5fc65eb99276acf5c81fc4812bf31251a0380b8e4fbc84a00718e5959ae7cb504cda06339e24cf070b8a2de1b0fce46cfb595f -AUX sqlitebrowser-3.7.0-unbundle.patch 475 BLAKE2B 1e2783eec7d7c054d18920fc88617f143220669a5c69c62b024fa33922eff9d13e3c4ba5e453d6b1767defdd8a918156094c1234ed3d6ad632ee4b3d919f6540 SHA512 4f90c4df8ef49943489b239f675a86259536b988585182c8b804f4ed6d38b5aabd83b32b21952329332d8520945304a4f9fea6287631a9a58ce5f311d9242fdb -AUX sqlitebrowser-3.9.1-cmake.patch 774 BLAKE2B 5773d3f70bc45348a4e3fc35fce57ad7eac416e7cc4d94eceb31ecc5e0ca2ed9dce837c299083e800b1ec7d80bd67d10ee60cf44c5a6915f39c619ef07f048f4 SHA512 f1a64286036d5c05e279fbf430f55400eb8f840564c0d9460424a42f87c4bd8d4f4e2c52c39e07d0bd3a50fa4a1e59bf591c53b1d28d2ef367af2ba25edae299 -DIST sqlitebrowser-3.10.1.tar.gz 1992186 BLAKE2B 105333118a404aab48abe5ecbe83b425109b60adf40d3a3b7766c7036954996539bd133da4b3e3b1e2d819223842d107710b6b24aada6bb298462e062296dabf SHA512 da9650fff6cd7984e8f438b254318b5da46209eb21a375569ec1b4dd898a41d99d61d6682f2979a56d5c39d552ed42f443215900c1cebe95350e4624415f69c4 -DIST sqlitebrowser-3.9.1.tar.gz 1704713 BLAKE2B 447a9e20fe4236feea2684703ac7f38b1c03f0ded352653b41bbec7d6380691776177fee1428fd67ac96190ed6752cedd76a9883cfa12584fec464cbf98707d3 SHA512 c1e88063fac864f60a9802ae378e13d6f3a09e2f4e71e50c6abca4967a941c444a64617bad2dfc743cf9a6be554af9c73e4c61533300ed9a51652234ffdbd225 -EBUILD sqlitebrowser-3.10.1.ebuild 1378 BLAKE2B 9ec28580c7efa201ae7907eed123ba36fdf497e67adcb75ebfa43f1fef3e7956fed44390d02161aba91e8085bb44e872f912c61ff2b6311eb7ddd9f77890bb28 SHA512 5918375456ecfa90e12f8784c3e0e5300f5cd056741a762096f9b65656f3d026015e26f338ba40a48ea1ad7a8649f83067272092ccb7de919ad758bae03e8096 -EBUILD sqlitebrowser-3.9.1-r1.ebuild 1439 BLAKE2B 355dc9a6af52f1879559b7774d93f226e46a9998de3557c0f52d2b8ecde160e9c777bcc7ac4c8d33d74337972d6def9ada5d404b36d456133df000ca552623da SHA512 ad218ab7dc42f42487868aeba8fef1f282369bfc2508e6cbd20f0da1c6101f93ff3b157970e34046be20dfd98a2418763941c679d31dde82940cfc2a480b0cee -MISC metadata.xml 740 BLAKE2B 43e5727769b3fa3fee9fe4514993988877b08a3a21816031cd21ae497a66801d6ba4993236e656b7de4161d22837975bb6d8e9cf93ebfd416235dd622a0b8758 SHA512 697ae7be911f1ce3a8b0c0f9f8509ac5fd338463b7b692ca320ab41ed7676fcc3d7db59e759cfbe82c6d2a1fa9d85a1eeefeda3bca702f56832f336ee7fd0369 diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-3.10.1-unbundle.patch b/dev-db/sqlitebrowser/files/sqlitebrowser-3.10.1-unbundle.patch deleted file mode 100644 index b774e41ecd83..000000000000 --- a/dev-db/sqlitebrowser/files/sqlitebrowser-3.10.1-unbundle.patch +++ /dev/null @@ -1,105 +0,0 @@ -diff --git a/cmake/FindQScintilla.cmake b/cmake/FindQScintilla.cmake -index f469637..92c2d37 100644 ---- a/cmake/FindQScintilla.cmake -+++ b/cmake/FindQScintilla.cmake -@@ -43,9 +43,12 @@ - #============================================================================= - - -+SET (QT_MIN_VERSION "5.6.2") -+FIND_PACKAGE( Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Network Widgets ) -+ - find_path ( QSCINTILLA_INCLUDE_DIR - NAMES qsciscintilla.h -- HINTS ${QT_INCLUDE_DIR} -+ HINTS ${Qt5Core_INCLUDE_DIRS} - PATH_SUFFIXES Qsci - ) - -@@ -81,6 +84,6 @@ endif () - - find_library ( QSCINTILLA_LIBRARY -- NAMES qscintilla qscintilla2 libqscintilla2 -- HINTS ${QT_LIBRARY_DIR} -+ NAMES qscintilla2 libqscintilla2 qscintilla2_qt5 libqscintilla2_qt5 -+ HINTS ${Qt5Core_LIBRARIES} - ) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index fdf5b4c..ffba6d7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -47,26 +47,20 @@ if(WIN32 AND MSVC) - endif() - - if(NOT FORCE_INTERNAL_ANTLR) -- find_package(Antlr2) -+ find_package(Antlr2 REQUIRED) - endif() - if(NOT FORCE_INTERNAL_QSCINTILLA) - find_package(QScintilla) - endif() - - set(QHEXEDIT_DIR libs/qhexedit) --set(QCUSTOMPLOT_DIR libs/qcustomplot-source) - --if(NOT ANTLR2_FOUND) -- set(ANTLR_DIR libs/antlr-2.7.7) -- add_subdirectory(${ANTLR_DIR}) --endif() - if(NOT QSCINTILLA_FOUND) - set(QSCINTILLA_DIR libs/qscintilla/Qt4Qt5) - add_subdirectory(${QSCINTILLA_DIR}) - endif() - add_subdirectory(${QHEXEDIT_DIR}) --add_subdirectory(${QCUSTOMPLOT_DIR}) - - find_package(Qt5Widgets REQUIRED) - find_package(Qt5LinguistTools REQUIRED) - ---- sqlitebrowser-3.10.1/src/tests/CMakeLists.txt -+++ sqlitebrowser-3.10.1/src/tests/CMakeLists.txt -@@ -49,9 +49,6 @@ - else() - target_link_libraries(test-sqlobjects antlr) - endif() --link_directories("${CMAKE_CURRENT_BINARY_DIR}/${QSCINTILLA_DIR}") --add_dependencies(test-sqlobjects qscintilla2) --target_link_libraries(test-sqlobjects qscintilla2) - add_test(test-sqlobjects test-sqlobjects) - - # test-import -@@ -118,7 +118,4 @@ - else() - target_link_libraries(test-regex antlr) - endif() --link_directories("${CMAKE_CURRENT_BINARY_DIR}/${QSCINTILLA_DIR}") --add_dependencies(test-regex qscintilla2) --target_link_libraries(test-regex qscintilla2) - add_test(test-regex test-regex) ---- sqlitebrowser-3.10.1/src/src.pro -+++ sqlitebrowser-3.10.1/src/src.pro -@@ -153,10 +150,7 @@ - } - } - - LIBPATH_QHEXEDIT=$$OUT_PWD/../libs/qhexedit --LIBPATH_ANTLR=$$OUT_PWD/../libs/antlr-2.7.7 --LIBPATH_QCUSTOMPLOT=$$OUT_PWD/../libs/qcustomplot-source --LIBPATH_QSCINTILLA=$$OUT_PWD/../libs/qscintilla/Qt4Qt5 - unix { - LIBS += -ldl - } -@@ -197,9 +193,9 @@ - } - - UI_DIR = .ui --INCLUDEPATH += $$PWD/../libs/antlr-2.7.7 $$PWD/../libs/qhexedit $$PWD/../libs/qcustomplot-source $$PWD/../libs/qscintilla/Qt4Qt5 $$PWD/.. --LIBS += -L$$LIBPATH_QHEXEDIT -L$$LIBPATH_ANTLR -L$$LIBPATH_QCUSTOMPLOT -L$$LIBPATH_QSCINTILLA -lantlr -lqhexedit -lqcustomplot -lqscintilla2 --DEPENDPATH += $$PWD/../libs/antlr-2.7.7 $$PWD/../libs/qhexedit $$PWD/../libs/qcustomplot-source $$PWD/../libs/qscintilla/Qt4Qt5 -+INCLUDEPATH += $$PWD/../libs/qhexedit $$PWD/.. -+LIBS += -L$$LIBPATH_QHEXEDIT -L$$LIBPATH_ANTLR -L$$LIBPATH_QCUSTOMPLOT -L$$LIBPATH_QSCINTILLA -lantlr -lqhexedit -lqcustomplot -lqscintilla2_qt5 -+DEPENDPATH += $$PWD/../libs/qhexedit - - unix { - # The executable diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-3.7.0-unbundle.patch b/dev-db/sqlitebrowser/files/sqlitebrowser-3.7.0-unbundle.patch deleted file mode 100644 index 8dbe870f2e87..000000000000 --- a/dev-db/sqlitebrowser/files/sqlitebrowser-3.7.0-unbundle.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- sqlitebrowser-3.7.0/CMakeLists.txt -+++ sqlitebrowser-3.7.0/CMakeLists.txt -@@ -29,15 +29,9 @@ - find_package(Antlr2) - - set(QHEXEDIT_DIR libs/qhexedit) --set(QCUSTOMPLOT_DIR libs/qcustomplot-source) - set(QSCINTILLA_DIR libs/qscintilla/Qt4Qt5) - --if(NOT ANTLR2_FOUND) -- set(ANTLR_DIR libs/antlr-2.7.7) -- add_subdirectory(${ANTLR_DIR}) --endif() - add_subdirectory(${QHEXEDIT_DIR}) --add_subdirectory(${QCUSTOMPLOT_DIR}) - add_subdirectory(${QSCINTILLA_DIR}) - - if(USE_QT5) diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-3.9.1-cmake.patch b/dev-db/sqlitebrowser/files/sqlitebrowser-3.9.1-cmake.patch deleted file mode 100644 index cf1cde6c9197..000000000000 --- a/dev-db/sqlitebrowser/files/sqlitebrowser-3.9.1-cmake.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 2563d678681fa6972674b47617015cb2515bd414 Mon Sep 17 00:00:00 2001 -From: Martin Kleusberg -Date: Wed, 12 Oct 2016 23:26:56 +0200 -Subject: [PATCH] Fix cmake file - ---- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 998c2f4..4c5debd 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 2.8.7) - - set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" "${CMAKE_MODULE_PATH}") - --OPTION(USE_QT5 FALSE "Build with qt5") --OPTION(ENABLE_TESTING FALSE "Enable the unit tests") -+OPTION(USE_QT5 "Build with qt5" OFF) -+OPTION(ENABLE_TESTING "Enable the unit tests" OFF) - - if(NOT CMAKE_BUILD_TYPE) - set(CMAKE_BUILD_TYPE "Release") diff --git a/dev-db/sqlitebrowser/metadata.xml b/dev-db/sqlitebrowser/metadata.xml deleted file mode 100644 index 778d9bfc7286..000000000000 --- a/dev-db/sqlitebrowser/metadata.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - xmw@gentoo.org - Michael Weber - - -SQLite Database Browser is a freeware, public domain, open source visual tool -used to create, design and edit database files compatible with SQLite. It is -meant to be used for users and developers that want to create databases, edit -and search data using a familiar spreadsheet-like interface, without the need to -learn complicated SQL commands. - - - sqlitebrowser/sqlitebrowser - - diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild deleted file mode 100644 index fb9278c28228..000000000000 --- a/dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils eutils gnome2-utils xdg-utils - -DESCRIPTION="SQLite Database Browser" -HOMEPAGE="http://sqlitebrowser.org" -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3 MPL-2.0" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="test" - -RDEPEND=" - dev-cpp/antlr-cpp:2 - dev-db/sqlite:3 - >=dev-libs/qcustomplot-2.0.0[qt5(+)] - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 - >=x11-libs/qscintilla-2.10.1:=[qt5(+)] -" -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5 - test? ( dev-qt/qttest:5 ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-3.10.1-unbundle.patch -) - -src_prepare() { - cmake-utils_src_prepare - # https://github.com/qingfengxia/qhexedit still bundled - find libs/{antlr-2.7.7,qcustomplot-source,qscintilla} -delete || die - - sed -e "/^project/ s/\".*\"/sqlitebrowser/" -i CMakeLists.txt || die - - if ! use test; then - sed -e "/qt5_use_modules/ s/ Test//" -i CMakeLists.txt || die - fi -} - -src_configure() { - local mycmakeargs=( - -DENABLE_TESTING=$(usex test) - ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - doicon images/sqlitebrowser.svg -} - -pkg_postinst() { - gnome2_icon_cache_update - xdg_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_desktop_database_update -} diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.9.1-r1.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-3.9.1-r1.ebuild deleted file mode 100644 index 9e91c60df05b..000000000000 --- a/dev-db/sqlitebrowser/sqlitebrowser-3.9.1-r1.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils eutils - -DESCRIPTION="SQLite Database Browser" -HOMEPAGE="http://sqlitebrowser.org" -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3 MPL-2.0" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="test" - -RDEPEND=" - dev-cpp/antlr-cpp:2 - dev-db/sqlite:3 - dev-libs/qcustomplot[qt5(+)] - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 - >=x11-libs/qscintilla-2.9.3-r2:=[qt5(+)] -" -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5 - test? ( dev-qt/qttest:5 ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-3.7.0-unbundle.patch - "${FILESDIR}"/${PN}-3.9.1-cmake.patch -) - -src_prepare() { - cmake-utils_src_prepare - # https://github.com/qingfengxia/qhexedit still bundled - # x11-libs/qscintilla[qt4?,qt5?] still bundled - find libs/{antlr-2.7.7,qcustomplot-source} -delete || die - - sed -e "/^project/ s/\".*\"/sqlitebrowser/" -i CMakeLists.txt || die - - if ! use test; then - sed -e "/qt5_use_modules/ s/ Test//" -i CMakeLists.txt || die - fi -} - -src_configure() { - local mycmakeargs=( - -DUSE_QT5=ON - -DENABLE_TESTING=$(usex test) - ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - doicon images/sqlitebrowser.svg -} - -pkg_postinst() { - gnome2_icon_cache_update - xdg_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_desktop_database_update -} -- cgit v1.2.3