Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde-sunset:master commit in: x11-libs/qscintilla/files/, x11-libs/qscintilla/
Date: Mon, 30 Nov 2020 02:19:31
Message-Id: 1606702758.4487ab4fb78b1381e132b61a01f8c90debe877ec.asturm@gentoo
1 commit: 4487ab4fb78b1381e132b61a01f8c90debe877ec
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Nov 30 01:35:08 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 30 02:19:18 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=4487ab4f
7
8 x11-libs/qscintilla: Drop 1.5.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 .../qscintilla/files/qscintilla-1.5-sandbox.patch | 30 -----------
14 x11-libs/qscintilla/qscintilla-1.5.1.ebuild | 61 ----------------------
15 2 files changed, 91 deletions(-)
16
17 diff --git a/x11-libs/qscintilla/files/qscintilla-1.5-sandbox.patch b/x11-libs/qscintilla/files/qscintilla-1.5-sandbox.patch
18 deleted file mode 100644
19 index 65bf1ad5..00000000
20 --- a/x11-libs/qscintilla/files/qscintilla-1.5-sandbox.patch
21 +++ /dev/null
22 @@ -1,30 +0,0 @@
23 ---- Makefile.orig 2005-01-23 03:57:03.000000000 +0100
24 -+++ Makefile 2005-01-23 03:57:35.000000000 +0100
25 -@@ -314,7 +314,7 @@
26 - QMAKE_TARGET = qscintilla
27 - DESTDIR = ${destdir}/
28 - TARGET = libqscintilla.so.5.2.0
29 --TARGETA = ${destdir}/libqscintilla.a
30 -+TARGETA = libqscintilla.a
31 - TARGETD = libqscintilla.so.5.2.0
32 - TARGET0 = libqscintilla.so
33 - TARGET1 = libqscintilla.so.5
34 -@@ -345,17 +345,12 @@
35 - all: Makefile ${destdir}/$(TARGET)
36 -
37 - ${destdir}/$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(OBJCOMP)
38 -- test -d ${destdir}/ || mkdir -p ${destdir}/
39 -+# test -d ${destdir}/ || mkdir -p ${destdir}/
40 - -$(DEL_FILE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
41 - $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) $(OBJCOMP)
42 - -ln -s $(TARGET) $(TARGET0)
43 - -ln -s $(TARGET) $(TARGET1)
44 - -ln -s $(TARGET) $(TARGET2)
45 -- -$(DEL_FILE) ${destdir}/$(TARGET)
46 -- -$(DEL_FILE) ${destdir}/$(TARGET0)
47 -- -$(DEL_FILE) ${destdir}/$(TARGET1)
48 -- -$(DEL_FILE) ${destdir}/$(TARGET2)
49 -- -$(MOVE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) ${destdir}/
50 -
51 -
52 -
53
54 diff --git a/x11-libs/qscintilla/qscintilla-1.5.1.ebuild b/x11-libs/qscintilla/qscintilla-1.5.1.ebuild
55 deleted file mode 100644
56 index 0a3a9b27..00000000
57 --- a/x11-libs/qscintilla/qscintilla-1.5.1.ebuild
58 +++ /dev/null
59 @@ -1,61 +0,0 @@
60 -# Copyright 1999-2013 Gentoo Foundation
61 -# Distributed under the terms of the GNU General Public License v2
62 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-1.5.1.ebuild,v 1.4 2009/11/04 17:44:32 yngwin Exp $
63 -
64 -inherit eutils toolchain-funcs
65 -
66 -SCINTILLA_VER="1.62"
67 -MY_P="${PN}-${SCINTILLA_VER}-gpl-${PV}"
68 -MY_P=${MY_P/_pre/snapshot-}
69 -S=${WORKDIR}/${MY_P}
70 -
71 -DESCRIPTION="QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ editor class."
72 -HOMEPAGE="http://www.riverbankcomputing.co.uk/qscintilla/"
73 -#SRC_URI="http://www.river-bank.demon.co.uk/download/snapshots/QScintilla/${MY_P}.tar.gz"
74 -#SRC_URI="http://www.river-bank.demon.co.uk/download/QScintilla/${MY_P}.tar.gz"
75 -SRC_URI="mirror://gentoo/${MY_P}.tar.gz mirror://kde-sunset/${MY_P}.tar.gz"
76 -
77 -SLOT="0"
78 -LICENSE="GPL-2"
79 -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
80 -IUSE="doc"
81 -
82 -RDEPEND="=dev-qt/qt-meta-3*"
83 -DEPEND="${RDEPEND}
84 - sys-apps/sed"
85 -
86 -LIBDIR="/usr/$(get_libdir)"
87 -
88 -src_unpack() {
89 - unpack ${A} ; cd "${S}"/qt
90 - sed -i -e "s:DESTDIR = \$(QTDIR)/lib:DESTDIR = \${destdir}:" qscintilla.pro
91 - echo -e "\nQMAKE_CFLAGS_RELEASE=${CFLAGS} -w\nQMAKE_CXXFLAGS_RELEASE=${CXXFLAGS} -w\nQMAKE_LFLAGS_RELEASE=${LDFLAGS}" >> qscintilla.pro
92 -
93 - ${QTDIR}/bin/qmake -o Makefile qscintilla.pro
94 - epatch "${FILESDIR}"/${PN}-1.5-sandbox.patch
95 -}
96 -
97 -src_compile() {
98 - cd "${S}"/qt
99 - # It uses g++'s syntax while linking (-Wl,) so it can't use tc-getLD.
100 - make destdir=${LIBDIR} all staticlib CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINK="$(tc-getCXX)" || die "make failed"
101 -}
102 -
103 -src_install() {
104 - dodoc ChangeLog NEWS README
105 - dodir /usr/include ${LIBDIR} /usr/share/qscintilla/translations
106 - cd "${S}"/qt
107 - cp qextscintilla*.h "${D}/usr/include"
108 - cp qscintilla*.qm "${D}/usr/share/qscintilla/translations"
109 - cp libqscintilla.a* "${D}${LIBDIR}"
110 - cp -d libqscintilla.so.* "${D}${LIBDIR}"
111 - dodir ${QTDIR}/translations/
112 - for I in $(ls -1 qscintilla*.qm) ; do
113 - dosym "/usr/share/qscintilla/translations/${I}" "${QTDIR}/translations/${I}"
114 - done
115 - if use doc ; then
116 - dohtml "${S}"/doc/html/*
117 - insinto /usr/share/doc/${PF}/Scintilla
118 - doins "${S}"/doc/Scintilla/*
119 - fi
120 -}