Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/sqliteman/, dev-db/sqliteman/files/
Date: Tue, 21 Nov 2017 10:31:24
Message-Id: 1511260267.87436a546204cd84761ac86ef8843937bab5bd2c.kensington@gentoo
1 commit: 87436a546204cd84761ac86ef8843937bab5bd2c
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Tue Nov 21 10:30:54 2017 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Tue Nov 21 10:31:07 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87436a54
7
8 dev-db/sqliteman: remove 1.2.2-r2 and 1.2.2-r3
9
10 Package-Manager: Portage-2.3.14, Repoman-2.3.6
11
12 .../files/sqliteman-1.2.2-qscintilla-2.10.patch | 13 ---------
13 dev-db/sqliteman/sqliteman-1.2.2-r2.ebuild | 32 --------------------
14 dev-db/sqliteman/sqliteman-1.2.2-r3.ebuild | 34 ----------------------
15 3 files changed, 79 deletions(-)
16
17 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
18 deleted file mode 100644
19 index c197ad34211..00000000000
20 --- a/dev-db/sqliteman/files/sqliteman-1.2.2-qscintilla-2.10.patch
21 +++ /dev/null
22 @@ -1,13 +0,0 @@
23 -diff --git a/cmake/modules/FindQScintilla.cmake b/cmake/modules/FindQScintilla.cmake
24 -index c4592d0..7700ec4 100644
25 ---- a/cmake/modules/FindQScintilla.cmake
26 -+++ b/cmake/modules/FindQScintilla.cmake
27 -@@ -21,7 +21,7 @@ IF(QT4_FOUND)
28 - "${QT_INCLUDE_DIR}/Qsci" /usr/include /usr/include/Qsci
29 - )
30 -
31 -- SET(QSCINTILLA_NAMES ${QSCINTILLA_NAMES} qscintilla2 libqscintilla2)
32 -+ SET(QSCINTILLA_NAMES ${QSCINTILLA_NAMES} qscintilla2 libqscintilla2 qscintilla2_qt4 libqscintilla2_qt4)
33 - FIND_LIBRARY(QSCINTILLA_LIBRARY
34 - NAMES ${QSCINTILLA_NAMES}
35 - PATHS ${QT_LIBRARY_DIR}
36
37 diff --git a/dev-db/sqliteman/sqliteman-1.2.2-r2.ebuild b/dev-db/sqliteman/sqliteman-1.2.2-r2.ebuild
38 deleted file mode 100644
39 index 0550f0f6afa..00000000000
40 --- a/dev-db/sqliteman/sqliteman-1.2.2-r2.ebuild
41 +++ /dev/null
42 @@ -1,32 +0,0 @@
43 -# Copyright 1999-2017 Gentoo Foundation
44 -# Distributed under the terms of the GNU General Public License v2
45 -
46 -EAPI=5
47 -
48 -inherit cmake-utils
49 -
50 -DESCRIPTION="Powerful GUI manager for the Sqlite3 database"
51 -HOMEPAGE="https://sourceforge.net/projects/sqliteman/"
52 -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
53 -
54 -LICENSE="GPL-2"
55 -SLOT="0"
56 -KEYWORDS="amd64 ~arm x86"
57 -IUSE=""
58 -
59 -RDEPEND="
60 - dev-qt/qtcore:4
61 - dev-qt/qtgui:4
62 - dev-qt/qtsql:4[sqlite]
63 - x11-libs/qscintilla:=[qt4(-)]"
64 -DEPEND="${RDEPEND}"
65 -
66 -DOCS=( AUTHORS README )
67 -PATCHES=( "${FILESDIR}/${P}-lpthread.patch" )
68 -
69 -src_prepare() {
70 - # remove bundled lib
71 - rm -rf "${S}"/${PN}/qscintilla2 || die
72 -
73 - cmake-utils_src_prepare
74 -}
75
76 diff --git a/dev-db/sqliteman/sqliteman-1.2.2-r3.ebuild b/dev-db/sqliteman/sqliteman-1.2.2-r3.ebuild
77 deleted file mode 100644
78 index e591dfbd957..00000000000
79 --- a/dev-db/sqliteman/sqliteman-1.2.2-r3.ebuild
80 +++ /dev/null
81 @@ -1,34 +0,0 @@
82 -# Copyright 1999-2017 Gentoo Foundation
83 -# Distributed under the terms of the GNU General Public License v2
84 -
85 -EAPI=6
86 -
87 -inherit cmake-utils
88 -
89 -DESCRIPTION="Powerful GUI manager for the Sqlite3 database"
90 -HOMEPAGE="https://sourceforge.net/projects/sqliteman/"
91 -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
92 -
93 -LICENSE="GPL-2"
94 -SLOT="0"
95 -KEYWORDS="~amd64 ~arm ~x86"
96 -IUSE=""
97 -
98 -RDEPEND="
99 - dev-qt/qtcore:4
100 - dev-qt/qtgui:4
101 - dev-qt/qtsql:4[sqlite]
102 - x11-libs/qscintilla:=[qt4(-)]"
103 -DEPEND="${RDEPEND}"
104 -
105 -PATCHES=(
106 - "${FILESDIR}/${P}-lpthread.patch"
107 - "${FILESDIR}/${P}-qscintilla-2.10.patch"
108 -)
109 -
110 -src_prepare() {
111 - # remove bundled lib
112 - rm -rf "${S}"/${PN}/qscintilla2 || die
113 -
114 - cmake-utils_src_prepare
115 -}