1 |
commit: 3379b627ad821d1f22eadd30b200c1feb7ed3765 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Nov 30 01:09:14 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Nov 30 01:09:14 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=3379b627 |
7 |
|
8 |
x11-libs/qscintilla: Drop 1.7.1 |
9 |
|
10 |
Package-Manager: Portage-3.0.11, Repoman-3.0.2 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
x11-libs/qscintilla/files/qscintilla-1.7.1.patch | 17 ------ |
14 |
x11-libs/qscintilla/files/qscintilla-2.2-qt.patch | 14 ----- |
15 |
x11-libs/qscintilla/files/qscintilla-2.2-qt4.patch | 19 ------ |
16 |
x11-libs/qscintilla/qscintilla-1.7.1.ebuild | 71 ---------------------- |
17 |
4 files changed, 121 deletions(-) |
18 |
|
19 |
diff --git a/x11-libs/qscintilla/files/qscintilla-1.7.1.patch b/x11-libs/qscintilla/files/qscintilla-1.7.1.patch |
20 |
deleted file mode 100644 |
21 |
index 5d63990c..00000000 |
22 |
--- a/x11-libs/qscintilla/files/qscintilla-1.7.1.patch |
23 |
+++ /dev/null |
24 |
@@ -1,17 +0,0 @@ |
25 |
---- designer/designer.pro.orig 2006-11-14 08:35:36.000000000 -0500 |
26 |
-+++ designer/designer.pro 2006-11-14 08:35:49.000000000 -0500 |
27 |
-@@ -3,10 +3,12 @@ |
28 |
- |
29 |
- TEMPLATE = lib |
30 |
- TARGET = qscintillaplugin |
31 |
--DESTDIR = $(QTDIR)/plugins/designer |
32 |
-+DESTDIR = . |
33 |
- |
34 |
- CONFIG += qt warn_on release plugin |
35 |
- |
36 |
- SOURCES += qscintillaplugin.cpp |
37 |
- |
38 |
--LIBS += -lqscintilla |
39 |
-+LIBS += -L../qt/lib -lqscintilla |
40 |
-+ |
41 |
-+INCLUDEPATH += ../qt |
42 |
|
43 |
diff --git a/x11-libs/qscintilla/files/qscintilla-2.2-qt.patch b/x11-libs/qscintilla/files/qscintilla-2.2-qt.patch |
44 |
deleted file mode 100644 |
45 |
index 98b4fb5a..00000000 |
46 |
--- a/x11-libs/qscintilla/files/qscintilla-2.2-qt.patch |
47 |
+++ /dev/null |
48 |
@@ -1,14 +0,0 @@ |
49 |
---- designer.pro.orig 2006-09-16 09:07:21.000000000 -0700 |
50 |
-+++ designer.pro 2007-06-24 18:57:47.000000000 -0700 |
51 |
-@@ -5,8 +5,10 @@ |
52 |
- TARGET = qscintillaplugin |
53 |
- DESTDIR = $(QTDIR)/plugins/designer |
54 |
- |
55 |
-+INCLUDEPATH = ../Qt3 |
56 |
-+ |
57 |
- CONFIG += qt warn_on release plugin |
58 |
- |
59 |
- SOURCES += qscintillaplugin.cpp |
60 |
- |
61 |
--LIBS += -lqscintilla2 |
62 |
-+LIBS += -L../Qt3 -lqscintilla2 |
63 |
|
64 |
diff --git a/x11-libs/qscintilla/files/qscintilla-2.2-qt4.patch b/x11-libs/qscintilla/files/qscintilla-2.2-qt4.patch |
65 |
deleted file mode 100644 |
66 |
index 35062e46..00000000 |
67 |
--- a/x11-libs/qscintilla/files/qscintilla-2.2-qt4.patch |
68 |
+++ /dev/null |
69 |
@@ -1,19 +0,0 @@ |
70 |
---- designer.pro.ori 2006-12-13 09:31:54.000000000 +0700 |
71 |
-+++ designer.pro 2006-12-13 09:40:49.000000000 +0700 |
72 |
-@@ -4,12 +4,14 @@ |
73 |
- TEMPLATE = lib |
74 |
- TARGET = qscintillaplugin |
75 |
- |
76 |
-+INCLUDEPATH = ../Qt4 |
77 |
-+ |
78 |
- CONFIG += designer release plugin |
79 |
- |
80 |
- HEADERS = qscintillaplugin.h |
81 |
- SOURCES = qscintillaplugin.cpp |
82 |
- |
83 |
--target.path = $$[QT_INSTALL_PLUGINS]/designer |
84 |
-+target.path = . |
85 |
- INSTALLS += target |
86 |
- |
87 |
--LIBS += -lqscintilla2 |
88 |
-+LIBS += -L../Qt4 -lqscintilla2 |
89 |
|
90 |
diff --git a/x11-libs/qscintilla/qscintilla-1.7.1.ebuild b/x11-libs/qscintilla/qscintilla-1.7.1.ebuild |
91 |
deleted file mode 100644 |
92 |
index e8425916..00000000 |
93 |
--- a/x11-libs/qscintilla/qscintilla-1.7.1.ebuild |
94 |
+++ /dev/null |
95 |
@@ -1,71 +0,0 @@ |
96 |
-# Copyright 1999-2013 Gentoo Foundation |
97 |
-# Distributed under the terms of the GNU General Public License v2 |
98 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-1.7.1.ebuild,v 1.4 2009/11/05 17:09:09 yngwin Exp $ |
99 |
- |
100 |
-EAPI=1 |
101 |
- |
102 |
-inherit eutils toolchain-funcs qt3 |
103 |
- |
104 |
-SCINTILLA_VER="1.71" |
105 |
-MY_P="${PN/qs/QS}-${SCINTILLA_VER}-gpl-${PV}" |
106 |
-MY_P=${MY_P/_pre/snapshot-} |
107 |
- |
108 |
-DESCRIPTION="QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ editor class." |
109 |
-HOMEPAGE="http://www.riverbankcomputing.co.uk/qscintilla/" |
110 |
-SRC_URI="http://www.riverbankcomputing.com/Downloads/QScintilla1/${MY_P}.tar.gz mirror://kde-sunset/${MY_P}.tar.gz" |
111 |
- |
112 |
-SLOT="0" |
113 |
-LICENSE="GPL-2" |
114 |
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc x86" |
115 |
-IUSE="doc" |
116 |
- |
117 |
-DEPEND="dev-qt/qt-meta:3" |
118 |
-RDEPEND="${DEPEND}" |
119 |
- |
120 |
-S=${WORKDIR}/${MY_P} |
121 |
- |
122 |
-src_unpack() { |
123 |
- unpack ${A} |
124 |
- |
125 |
- cd "${S}/qt" |
126 |
- sed -i -e "s:DESTDIR = \$(QTDIR)/lib:DESTDIR = lib:" qscintilla.pro |
127 |
- echo -e "\nQMAKE_CFLAGS_RELEASE=${CFLAGS} -w\nQMAKE_CXXFLAGS_RELEASE=${CXXFLAGS} -w\nQMAKE_LFLAGS_RELEASE=${LDFLAGS}" >> qscintilla.pro |
128 |
- ${QTDIR}/bin/qmake -o Makefile qscintilla.pro || die "qmake qscintilla failed" |
129 |
- |
130 |
- cd "${S}" |
131 |
- epatch "${FILESDIR}/${P}.patch" |
132 |
- |
133 |
- cd "${S}/designer" |
134 |
- echo -e "\nQMAKE_CFLAGS_RELEASE=${CFLAGS} -w\nQMAKE_CXXFLAGS_RELEASE=${CXXFLAGS} -w\nQMAKE_LFLAGS_RELEASE=${LDFLAGS}" >> designer.pro |
135 |
- ${QTDIR}/bin/qmake -o Makefile designer.pro || die "qmake designer failed" |
136 |
-} |
137 |
- |
138 |
-src_compile() { |
139 |
- cd "${S}/qt" |
140 |
- emake all staticlib CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINK="$(tc-getCXX)" || die "emake failed" |
141 |
- cd "${S}/designer" |
142 |
- dodir ${QTDIR}/plugins/designer |
143 |
- emake || die "emake designer failed" |
144 |
-} |
145 |
- |
146 |
-src_install() { |
147 |
- dodoc ChangeLog NEWS README* |
148 |
- dodir /usr/{include,$(get_libdir),share/qscintilla/translations} |
149 |
- cd "${S}"/qt |
150 |
- cp qextscintilla*.h "${D}/usr/include" |
151 |
- cp qscintilla*.qm "${D}/usr/share/qscintilla/translations" |
152 |
- cp lib/libqscintilla.a* "${D}/usr/$(get_libdir)" |
153 |
- cp -R lib/libqscintilla.so.* "${D}/usr/$(get_libdir)" |
154 |
- dodir ${QTDIR}/translations/ |
155 |
- for I in $(ls -1 qscintilla*.qm) ; do |
156 |
- dosym "/usr/share/qscintilla/translations/${I}" "${QTDIR}/translations/${I}" |
157 |
- done |
158 |
- if use doc ; then |
159 |
- dohtml "${S}"/doc/html/* |
160 |
- insinto /usr/share/doc/${PF}/Scintilla |
161 |
- doins "${S}"/doc/Scintilla/* |
162 |
- fi |
163 |
- insinto ${QTDIR}/plugins/designer |
164 |
- insopts -m0755 |
165 |
- doins "${S}"/designer/libqscintillaplugin.so |
166 |
-} |