From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9229D13835A for ; Mon, 30 Nov 2020 02:19:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CCD65E0858; Mon, 30 Nov 2020 02:19:30 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A8DCCE0858 for ; Mon, 30 Nov 2020 02:19:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 98E2334154A for ; Mon, 30 Nov 2020 02:19:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 12FFC47A for ; Mon, 30 Nov 2020 02:19:27 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1606702758.4487ab4fb78b1381e132b61a01f8c90debe877ec.asturm@gentoo> Subject: [gentoo-commits] proj/kde-sunset:master commit in: x11-libs/qscintilla/files/, x11-libs/qscintilla/ X-VCS-Repository: proj/kde-sunset X-VCS-Files: x11-libs/qscintilla/files/qscintilla-1.5-sandbox.patch x11-libs/qscintilla/qscintilla-1.5.1.ebuild X-VCS-Directories: x11-libs/qscintilla/ x11-libs/qscintilla/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 4487ab4fb78b1381e132b61a01f8c90debe877ec X-VCS-Branch: master Date: Mon, 30 Nov 2020 02:19:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6b96e8b8-0f20-4a49-85b6-b78445878a2e X-Archives-Hash: 60ec4b427bb8ae83569ebf4722d22cc5 commit: 4487ab4fb78b1381e132b61a01f8c90debe877ec Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Nov 30 01:35:08 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Nov 30 02:19:18 2020 +0000 URL: https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=4487ab4f x11-libs/qscintilla: Drop 1.5.1 Package-Manager: Portage-3.0.11, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner gentoo.org> .../qscintilla/files/qscintilla-1.5-sandbox.patch | 30 ----------- x11-libs/qscintilla/qscintilla-1.5.1.ebuild | 61 ---------------------- 2 files changed, 91 deletions(-) diff --git a/x11-libs/qscintilla/files/qscintilla-1.5-sandbox.patch b/x11-libs/qscintilla/files/qscintilla-1.5-sandbox.patch deleted file mode 100644 index 65bf1ad5..00000000 --- a/x11-libs/qscintilla/files/qscintilla-1.5-sandbox.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- Makefile.orig 2005-01-23 03:57:03.000000000 +0100 -+++ Makefile 2005-01-23 03:57:35.000000000 +0100 -@@ -314,7 +314,7 @@ - QMAKE_TARGET = qscintilla - DESTDIR = ${destdir}/ - TARGET = libqscintilla.so.5.2.0 --TARGETA = ${destdir}/libqscintilla.a -+TARGETA = libqscintilla.a - TARGETD = libqscintilla.so.5.2.0 - TARGET0 = libqscintilla.so - TARGET1 = libqscintilla.so.5 -@@ -345,17 +345,12 @@ - all: Makefile ${destdir}/$(TARGET) - - ${destdir}/$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(OBJCOMP) -- test -d ${destdir}/ || mkdir -p ${destdir}/ -+# test -d ${destdir}/ || mkdir -p ${destdir}/ - -$(DEL_FILE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) - $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) $(OBJCOMP) - -ln -s $(TARGET) $(TARGET0) - -ln -s $(TARGET) $(TARGET1) - -ln -s $(TARGET) $(TARGET2) -- -$(DEL_FILE) ${destdir}/$(TARGET) -- -$(DEL_FILE) ${destdir}/$(TARGET0) -- -$(DEL_FILE) ${destdir}/$(TARGET1) -- -$(DEL_FILE) ${destdir}/$(TARGET2) -- -$(MOVE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) ${destdir}/ - - - diff --git a/x11-libs/qscintilla/qscintilla-1.5.1.ebuild b/x11-libs/qscintilla/qscintilla-1.5.1.ebuild deleted file mode 100644 index 0a3a9b27..00000000 --- a/x11-libs/qscintilla/qscintilla-1.5.1.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-1.5.1.ebuild,v 1.4 2009/11/04 17:44:32 yngwin Exp $ - -inherit eutils toolchain-funcs - -SCINTILLA_VER="1.62" -MY_P="${PN}-${SCINTILLA_VER}-gpl-${PV}" -MY_P=${MY_P/_pre/snapshot-} -S=${WORKDIR}/${MY_P} - -DESCRIPTION="QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ editor class." -HOMEPAGE="http://www.riverbankcomputing.co.uk/qscintilla/" -#SRC_URI="http://www.river-bank.demon.co.uk/download/snapshots/QScintilla/${MY_P}.tar.gz" -#SRC_URI="http://www.river-bank.demon.co.uk/download/QScintilla/${MY_P}.tar.gz" -SRC_URI="mirror://gentoo/${MY_P}.tar.gz mirror://kde-sunset/${MY_P}.tar.gz" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" -IUSE="doc" - -RDEPEND="=dev-qt/qt-meta-3*" -DEPEND="${RDEPEND} - sys-apps/sed" - -LIBDIR="/usr/$(get_libdir)" - -src_unpack() { - unpack ${A} ; cd "${S}"/qt - sed -i -e "s:DESTDIR = \$(QTDIR)/lib:DESTDIR = \${destdir}:" qscintilla.pro - echo -e "\nQMAKE_CFLAGS_RELEASE=${CFLAGS} -w\nQMAKE_CXXFLAGS_RELEASE=${CXXFLAGS} -w\nQMAKE_LFLAGS_RELEASE=${LDFLAGS}" >> qscintilla.pro - - ${QTDIR}/bin/qmake -o Makefile qscintilla.pro - epatch "${FILESDIR}"/${PN}-1.5-sandbox.patch -} - -src_compile() { - cd "${S}"/qt - # It uses g++'s syntax while linking (-Wl,) so it can't use tc-getLD. - make destdir=${LIBDIR} all staticlib CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINK="$(tc-getCXX)" || die "make failed" -} - -src_install() { - dodoc ChangeLog NEWS README - dodir /usr/include ${LIBDIR} /usr/share/qscintilla/translations - cd "${S}"/qt - cp qextscintilla*.h "${D}/usr/include" - cp qscintilla*.qm "${D}/usr/share/qscintilla/translations" - cp libqscintilla.a* "${D}${LIBDIR}" - cp -d libqscintilla.so.* "${D}${LIBDIR}" - dodir ${QTDIR}/translations/ - for I in $(ls -1 qscintilla*.qm) ; do - dosym "/usr/share/qscintilla/translations/${I}" "${QTDIR}/translations/${I}" - done - if use doc ; then - dohtml "${S}"/doc/html/* - insinto /usr/share/doc/${PF}/Scintilla - doins "${S}"/doc/Scintilla/* - fi -}