Gentoo Archives: gentoo-commits

From: Pacho Ramos <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/, dev-db/sqlitebrowser/files/
Date: Sun, 27 Jan 2019 11:06:24
Message-Id: 1548587122.b65bd41c91329de75a67a15aee65044768280624.pacho@gentoo
1 commit: b65bd41c91329de75a67a15aee65044768280624
2 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 27 10:37:36 2019 +0000
4 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 27 11:05:22 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b65bd41c
7
8 dev-db/sqlitebrowser: Drop old
9
10 Package-Manager: Portage-2.3.58, Repoman-2.3.12
11 Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
12
13 dev-db/sqlitebrowser/Manifest | 1 -
14 .../files/sqlitebrowser-3.7.0-unbundle.patch | 18 ------
15 .../files/sqlitebrowser-3.9.1-cmake.patch | 24 --------
16 dev-db/sqlitebrowser/sqlitebrowser-3.9.1-r1.ebuild | 71 ----------------------
17 4 files changed, 114 deletions(-)
18
19 diff --git a/dev-db/sqlitebrowser/Manifest b/dev-db/sqlitebrowser/Manifest
20 index 9b89c8bd849..861e19002a8 100644
21 --- a/dev-db/sqlitebrowser/Manifest
22 +++ b/dev-db/sqlitebrowser/Manifest
23 @@ -1,2 +1 @@
24 DIST sqlitebrowser-3.10.1.tar.gz 1992186 BLAKE2B 105333118a404aab48abe5ecbe83b425109b60adf40d3a3b7766c7036954996539bd133da4b3e3b1e2d819223842d107710b6b24aada6bb298462e062296dabf SHA512 da9650fff6cd7984e8f438b254318b5da46209eb21a375569ec1b4dd898a41d99d61d6682f2979a56d5c39d552ed42f443215900c1cebe95350e4624415f69c4
25 -DIST sqlitebrowser-3.9.1.tar.gz 1704713 BLAKE2B 447a9e20fe4236feea2684703ac7f38b1c03f0ded352653b41bbec7d6380691776177fee1428fd67ac96190ed6752cedd76a9883cfa12584fec464cbf98707d3 SHA512 c1e88063fac864f60a9802ae378e13d6f3a09e2f4e71e50c6abca4967a941c444a64617bad2dfc743cf9a6be554af9c73e4c61533300ed9a51652234ffdbd225
26
27 diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-3.7.0-unbundle.patch b/dev-db/sqlitebrowser/files/sqlitebrowser-3.7.0-unbundle.patch
28 deleted file mode 100644
29 index 8dbe870f2e8..00000000000
30 --- a/dev-db/sqlitebrowser/files/sqlitebrowser-3.7.0-unbundle.patch
31 +++ /dev/null
32 @@ -1,18 +0,0 @@
33 ---- sqlitebrowser-3.7.0/CMakeLists.txt
34 -+++ sqlitebrowser-3.7.0/CMakeLists.txt
35 -@@ -29,15 +29,9 @@
36 - find_package(Antlr2)
37 -
38 - set(QHEXEDIT_DIR libs/qhexedit)
39 --set(QCUSTOMPLOT_DIR libs/qcustomplot-source)
40 - set(QSCINTILLA_DIR libs/qscintilla/Qt4Qt5)
41 -
42 --if(NOT ANTLR2_FOUND)
43 -- set(ANTLR_DIR libs/antlr-2.7.7)
44 -- add_subdirectory(${ANTLR_DIR})
45 --endif()
46 - add_subdirectory(${QHEXEDIT_DIR})
47 --add_subdirectory(${QCUSTOMPLOT_DIR})
48 - add_subdirectory(${QSCINTILLA_DIR})
49 -
50 - if(USE_QT5)
51
52 diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-3.9.1-cmake.patch b/dev-db/sqlitebrowser/files/sqlitebrowser-3.9.1-cmake.patch
53 deleted file mode 100644
54 index cf1cde6c919..00000000000
55 --- a/dev-db/sqlitebrowser/files/sqlitebrowser-3.9.1-cmake.patch
56 +++ /dev/null
57 @@ -1,24 +0,0 @@
58 -From 2563d678681fa6972674b47617015cb2515bd414 Mon Sep 17 00:00:00 2001
59 -From: Martin Kleusberg <mkleusberg@×××××.com>
60 -Date: Wed, 12 Oct 2016 23:26:56 +0200
61 -Subject: [PATCH] Fix cmake file
62 -
63 ----
64 - CMakeLists.txt | 4 ++--
65 - 1 file changed, 2 insertions(+), 2 deletions(-)
66 -
67 -diff --git a/CMakeLists.txt b/CMakeLists.txt
68 -index 998c2f4..4c5debd 100644
69 ---- a/CMakeLists.txt
70 -+++ b/CMakeLists.txt
71 -@@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 2.8.7)
72 -
73 - set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" "${CMAKE_MODULE_PATH}")
74 -
75 --OPTION(USE_QT5 FALSE "Build with qt5")
76 --OPTION(ENABLE_TESTING FALSE "Enable the unit tests")
77 -+OPTION(USE_QT5 "Build with qt5" OFF)
78 -+OPTION(ENABLE_TESTING "Enable the unit tests" OFF)
79 -
80 - if(NOT CMAKE_BUILD_TYPE)
81 - set(CMAKE_BUILD_TYPE "Release")
82
83 diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.9.1-r1.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-3.9.1-r1.ebuild
84 deleted file mode 100644
85 index 9e91c60df05..00000000000
86 --- a/dev-db/sqlitebrowser/sqlitebrowser-3.9.1-r1.ebuild
87 +++ /dev/null
88 @@ -1,71 +0,0 @@
89 -# Copyright 1999-2017 Gentoo Foundation
90 -# Distributed under the terms of the GNU General Public License v2
91 -
92 -EAPI=6
93 -
94 -inherit cmake-utils eutils
95 -
96 -DESCRIPTION="SQLite Database Browser"
97 -HOMEPAGE="http://sqlitebrowser.org"
98 -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
99 -
100 -LICENSE="GPL-3 MPL-2.0"
101 -SLOT="0"
102 -KEYWORDS="amd64 x86"
103 -IUSE="test"
104 -
105 -RDEPEND="
106 - dev-cpp/antlr-cpp:2
107 - dev-db/sqlite:3
108 - dev-libs/qcustomplot[qt5(+)]
109 - dev-qt/qtcore:5
110 - dev-qt/qtgui:5
111 - dev-qt/qtnetwork:5
112 - dev-qt/qtwidgets:5
113 - >=x11-libs/qscintilla-2.9.3-r2:=[qt5(+)]
114 -"
115 -DEPEND="${RDEPEND}
116 - dev-qt/linguist-tools:5
117 - test? ( dev-qt/qttest:5 )
118 -"
119 -
120 -PATCHES=(
121 - "${FILESDIR}"/${PN}-3.7.0-unbundle.patch
122 - "${FILESDIR}"/${PN}-3.9.1-cmake.patch
123 -)
124 -
125 -src_prepare() {
126 - cmake-utils_src_prepare
127 - # https://github.com/qingfengxia/qhexedit still bundled
128 - # x11-libs/qscintilla[qt4?,qt5?] still bundled
129 - find libs/{antlr-2.7.7,qcustomplot-source} -delete || die
130 -
131 - sed -e "/^project/ s/\".*\"/sqlitebrowser/" -i CMakeLists.txt || die
132 -
133 - if ! use test; then
134 - sed -e "/qt5_use_modules/ s/ Test//" -i CMakeLists.txt || die
135 - fi
136 -}
137 -
138 -src_configure() {
139 - local mycmakeargs=(
140 - -DUSE_QT5=ON
141 - -DENABLE_TESTING=$(usex test)
142 - )
143 - cmake-utils_src_configure
144 -}
145 -
146 -src_install() {
147 - cmake-utils_src_install
148 - doicon images/sqlitebrowser.svg
149 -}
150 -
151 -pkg_postinst() {
152 - gnome2_icon_cache_update
153 - xdg_desktop_database_update
154 -}
155 -
156 -pkg_postrm() {
157 - gnome2_icon_cache_update
158 - xdg_desktop_database_update
159 -}