public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/kde-sunset:master commit in: x11-libs/qscintilla/
@ 2011-02-27 22:21 Roman v. Gemmeren
  0 siblings, 0 replies; 4+ messages in thread
From: Roman v. Gemmeren @ 2011-02-27 22:21 UTC (permalink / raw
  To: gentoo-commits

commit:     4eca819a5f74948eb64eb13bde730ee741b181dd
Author:     Roman v. Gemmeren <strowi <AT> hasnoname <DOT> de>
AuthorDate: Sun Feb 27 22:08:14 2011 +0000
Commit:     Roman v. Gemmeren <strowi <AT> hasnoname <DOT> de>
CommitDate: Sun Feb 27 22:08:14 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde-sunset.git;a=commit;h=4eca819a

x11-libs/qscintilla sources seem to have vanished from mirrors,
+kde-sunset mirror

---
 x11-libs/qscintilla/qscintilla-1.5.1.ebuild |    2 +-
 x11-libs/qscintilla/qscintilla-1.7.1.ebuild |    2 +-
 x11-libs/qscintilla/qscintilla-2.3.2.ebuild |    2 +-
 x11-libs/qscintilla/qscintilla-2.4.ebuild   |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/x11-libs/qscintilla/qscintilla-1.5.1.ebuild b/x11-libs/qscintilla/qscintilla-1.5.1.ebuild
index e770f9e..2e2b140 100644
--- a/x11-libs/qscintilla/qscintilla-1.5.1.ebuild
+++ b/x11-libs/qscintilla/qscintilla-1.5.1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ editor c
 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"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz mirror://kde-sunset/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"

diff --git a/x11-libs/qscintilla/qscintilla-1.7.1.ebuild b/x11-libs/qscintilla/qscintilla-1.7.1.ebuild
index 4ed1250..f18673b 100644
--- a/x11-libs/qscintilla/qscintilla-1.7.1.ebuild
+++ b/x11-libs/qscintilla/qscintilla-1.7.1.ebuild
@@ -12,7 +12,7 @@ MY_P=${MY_P/_pre/snapshot-}
 
 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.riverbankcomputing.com/Downloads/QScintilla1/${MY_P}.tar.gz"
+SRC_URI="http://www.riverbankcomputing.com/Downloads/QScintilla1/${MY_P}.tar.gz  mirror://kde-sunset/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"

diff --git a/x11-libs/qscintilla/qscintilla-2.3.2.ebuild b/x11-libs/qscintilla/qscintilla-2.3.2.ebuild
index 6cafc95..0112948 100644
--- a/x11-libs/qscintilla/qscintilla-2.3.2.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.3.2.ebuild
@@ -10,7 +10,7 @@ S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="A Qt port of Neil Hodgson's Scintilla C++ editor class"
 HOMEPAGE="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
-SRC_URI="http://www.riverbankcomputing.com/static/Downloads/QScintilla2/${MY_P}.tar.gz"
+SRC_URI="http://www.riverbankcomputing.com/static/Downloads/QScintilla2/${MY_P}.tar.gz  mirror://kde-sunset/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"

diff --git a/x11-libs/qscintilla/qscintilla-2.4.ebuild b/x11-libs/qscintilla/qscintilla-2.4.ebuild
index 14f8661..00c38eb 100644
--- a/x11-libs/qscintilla/qscintilla-2.4.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.4.ebuild
@@ -10,7 +10,7 @@ MY_P="QScintilla-gpl-${PV/_pre/-snapshot-}"
 
 DESCRIPTION="A Qt port of Neil Hodgson's Scintilla C++ editor class"
 HOMEPAGE="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
-SRC_URI="http://www.riverbankcomputing.co.uk/static/Downloads/QScintilla2/${MY_P}.tar.gz"
+SRC_URI="http://www.riverbankcomputing.co.uk/static/Downloads/QScintilla2/${MY_P}.tar.gz mirror://kde-sunset/${MY_P}.tar.gz"
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"



^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/kde-sunset:master commit in: x11-libs/qscintilla/
@ 2020-11-30  0:52 Andreas Sturmlechner
  0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2020-11-30  0:52 UTC (permalink / raw
  To: gentoo-commits

commit:     a27051e0519c2af54bdf278f17786723d5df962d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 24 11:07:19 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 30 00:51:52 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=a27051e0

x11-libs/qscintilla: Drop 2.3.2 and 2.4 (r0)

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 x11-libs/qscintilla/qscintilla-2.3.2.ebuild | 138 ----------------------------
 x11-libs/qscintilla/qscintilla-2.4.ebuild   |  92 -------------------
 2 files changed, 230 deletions(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.3.2.ebuild b/x11-libs/qscintilla/qscintilla-2.3.2.ebuild
deleted file mode 100644
index 68ddd0d7..00000000
--- a/x11-libs/qscintilla/qscintilla-2.3.2.ebuild
+++ /dev/null
@@ -1,138 +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-2.3.2.ebuild,v 1.9 2009/06/01 22:28:49 yngwin Exp $
-
-EAPI=2
-inherit eutils toolchain-funcs multilib
-
-MY_P="${PN/qs/QS}-gpl-${PV}"
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="A Qt port of Neil Hodgson's Scintilla C++ editor class"
-HOMEPAGE="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
-SRC_URI="http://www.riverbankcomputing.com/static/Downloads/QScintilla2/${MY_P}.tar.gz  mirror://kde-sunset/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~sparc x86"
-IUSE="qt4 +python doc examples debug"
-
-RDEPEND="qt4? ( dev-qt/qtgui:4 )
-	!qt4? ( dev-qt/qt-meta:3 )"
-DEPEND="${RDEPEND}"
-# dev-python/PyQt needs qscintilla to build and qscintilla's python bindings
-# need dev-python/PyQt, bug 199543
-PDEPEND="python? ( dev-python/qscintilla-python[qt4=] )"
-
-src_configure() {
-	local myqmake myqtdir
-	if use qt4; then
-		myqmake=/usr/bin/qmake
-		myqtdir=Qt4
-	else
-		myqmake="${QTDIR}/bin/qmake"
-		myqtdir=Qt3
-	fi
-
-	cd "${S}/${myqtdir}"
-	sed -i \
-		-e "s:DESTDIR = \$(QTDIR)/lib:DESTDIR = lib:" \
-		-e "s:DESTDIR = \$\$\[QT_INSTALL_LIBS\]:DESTDIR = lib:"\
-		qscintilla.pro || die "sed in qscintilla.pro failed"
-
-	cat <<- EOF >> qscintilla.pro
-	QMAKE_CFLAGS_RELEASE=${CFLAGS} -w
-	QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS} -w
-	QMAKE_LFLAGS_RELEASE=${LDFLAGS}
-	EOF
-
-	${myqmake} -o Makefile qscintilla.pro
-	cd "${S}/designer-${myqtdir}"
-
-	if use qt4; then
-		epatch "${FILESDIR}/${PN}-2.2-qt4.patch"
-	else
-		epatch "${FILESDIR}/${PN}-2.2-qt.patch"
-
-		sed -i \
-			-e "s:DESTDIR = \$(QTDIR)/plugins/designer:DESTDIR = .:" \
-			designer.pro || die "sed in designer.pro failed"
-	fi
-
-	cat <<- EOF >> designer.pro
-	QMAKE_CFLAGS_RELEASE=${CFLAGS} -w
-	QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS} -w
-	QMAKE_LFLAGS_RELEASE=${LDFLAGS}
-	EOF
-
-	${myqmake} -o Makefile designer.pro
-}
-
-src_compile() {
-	if use qt4; then
-		cd "${S}"/Qt4
-	else
-		cd "${S}"/Qt3
-	fi
-	make all staticlib CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINK="$(tc-getCXX)" || die "make failed"
-
-	if use qt4; then
-		cd "${S}"/designer-Qt4
-		make DESTDIR="${D}"/usr/lib/qt4/plugins/designer || die "make failed"
-		dodir /usr/lib/qt4/plugins/designer
-	else
-		cd "${S}"/designer-Qt3
-		make DESTDIR="${D}"/${QTDIR}/plugins/designer || die "make failed"
-		dodir ${QTDIR}/plugins/designer
-	fi
-	make
-}
-
-src_install() {
-	dodoc ChangeLog NEWS README*
-	dodir /usr/{include,$(get_libdir),share/qscintilla/translations}
-	if use qt4; then
-		cd "${S}"/Qt4
-	else
-		cd "${S}"/Qt3
-	fi
-	cp -r Qsci "${D}/usr/include"
-	#cp qextscintilla*.h "${D}/usr/include"
-	cp qscintilla*.qm "${D}/usr/share/qscintilla/translations"
-	cp libqscintilla2.a* "${D}/usr/$(get_libdir)"
-	cp -d libqscintilla2.so.* "${D}/usr/$(get_libdir)"
-	if use qt4; then
-		dodir /usr/share/qt4/translations/
-		for I in $(ls -1 qscintilla*.qm) ; do
-			dosym "/usr/share/qscintilla/translations/${I}" "/usr/share/qt4/translations/${I}"
-		done
-	else
-		dodir ${QTDIR}/translations/
-		for I in $(ls -1 qscintilla*.qm) ; do
-			dosym "/usr/share/qscintilla/translations/${I}" "${QTDIR}/translations/${I}"
-		done
-	fi
-	if use doc ; then
-		dohtml "${S}"/doc/html/*
-		insinto /usr/share/doc/${PF}/Scintilla
-		doins "${S}"/doc/Scintilla/*
-	fi
-	if use qt4; then
-		insinto /usr/$(get_libdir)/qt4/plugins/designer
-		insopts  -m0755
-		doins "${S}"/designer-Qt4/libqscintillaplugin.so
-	else
-		insinto ${QTDIR}/plugins/designer
-		insopts  -m0755
-		doins "${S}"/designer-Qt3/libqscintillaplugin.so
-	fi
-}
-
-pkg_postinst() {
-	if use qt4; then
-		ewarn "Please remerge dev-python/PyQt4 if you have problems with eric4"
-	else
-		ewarn "Please remerge dev-python/PyQt if you have problems with eric3"
-	fi
-	ewarn "or other qscintilla related packages before submitting bug reports."
-}

diff --git a/x11-libs/qscintilla/qscintilla-2.4.ebuild b/x11-libs/qscintilla/qscintilla-2.4.ebuild
deleted file mode 100644
index bc3df479..00000000
--- a/x11-libs/qscintilla/qscintilla-2.4.ebuild
+++ /dev/null
@@ -1,92 +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-2.4.ebuild,v 1.6 2009/10/18 14:48:05 armin76 Exp $
-
-EAPI="2"
-
-inherit eutils multilib qt3 qt4-r2
-
-MY_P="QScintilla-gpl-${PV/_pre/-snapshot-}"
-
-DESCRIPTION="A Qt port of Neil Hodgson's Scintilla C++ editor class"
-HOMEPAGE="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
-SRC_URI="http://www.riverbankcomputing.co.uk/static/Downloads/QScintilla2/${MY_P}.tar.gz mirror://kde-sunset/${MY_P}.tar.gz"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
-IUSE="doc python +qt4"
-
-RDEPEND="qt4? ( dev-qt/qtgui:4 )
-	!qt4? ( dev-qt/qt-meta:3 )"
-DEPEND="${RDEPEND}"
-# dev-python/PyQt needs qscintilla to build and qscintilla's python bindings
-# need dev-python/PyQt, bug 199543
-PDEPEND="python? ( ~dev-python/qscintilla-python-${PV}[qt4=] )"
-
-S="${WORKDIR}"/${MY_P}
-
-PATCHES=( "${FILESDIR}/${PN}-2.4-designer.patch" )
-
-src_configure() {
-	if use qt4; then
-		myqtver=4
-		myqtdir=/usr/share/qt4
-	else
-		myqtver=3
-		myqtdir=${QTDIR}
-	fi
-
-	cd "${S}"/Qt${myqtver}
-	eqmake${myqtver} qscintilla.pro
-
-	cd "${S}"/designer-Qt${myqtver}
-	eqmake${myqtver} designer.pro
-}
-
-src_compile() {
-	cd "${S}"/Qt${myqtver}
-	emake all staticlib || die "emake failed"
-
-	cd "${S}"/designer-Qt${myqtver}
-	emake || die "failed to build designer plugin"
-}
-
-src_install() {
-	cd "${S}"/Qt${myqtver}
-	# header files
-	insinto /usr/include/Qsci
-	doins Qsci/*.h || die
-	# libraries
-	dolib.so libqscintilla2.so* || die
-	dolib.a libqscintilla2.a || die
-	# translations
-	insinto /usr/share/${PN}/translations
-	doins qscintilla_*.qm || die
-	for trans in $(ls -1 qscintilla_*.qm); do
-		dosym /usr/share/${PN}/translations/${trans} \
-			${myqtdir}/translations/${trans} || die
-	done
-
-	# designer plugin
-	cd "${S}"/designer-Qt${myqtver}
-	emake INSTALL_ROOT="${D}" install || die "designer plugin installation failed"
-
-	# documentation
-	cd "${S}"
-	dodoc ChangeLog NEWS
-	if use doc; then
-		dohtml doc/html-Qt${myqtver}/* || die
-		insinto /usr/share/doc/${PF}/Scintilla
-		doins doc/Scintilla/* || die
-	fi
-}
-
-pkg_postinst() {
-	if use qt4; then
-		ewarn "Please remerge dev-python/PyQt4 if you have problems with eric or other"
-	else
-		ewarn "Please remerge dev-python/PyQt if you have problems with"
-	fi
-	ewarn "qscintilla related packages before submitting bug reports."
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/kde-sunset:master commit in: x11-libs/qscintilla/
@ 2020-11-30  0:52 Andreas Sturmlechner
  0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2020-11-30  0:52 UTC (permalink / raw
  To: gentoo-commits

commit:     551d21a0429a481a62ed439f5adec94aa9fca84c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 24 11:05:41 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 30 00:51:52 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=551d21a0

x11-libs/qscintilla: Remove IUSE="python,qt4" thusly option to build w/ Qt3

No more revdeps and easier (non-)maintenance without python.
Drop to ~ppc as well for unkeyworded dependencies.

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 x11-libs/qscintilla/qscintilla-2.4-r1.ebuild | 75 ++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)

diff --git a/x11-libs/qscintilla/qscintilla-2.4-r1.ebuild b/x11-libs/qscintilla/qscintilla-2.4-r1.ebuild
new file mode 100644
index 00000000..02ff0987
--- /dev/null
+++ b/x11-libs/qscintilla/qscintilla-2.4-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+
+MY_P="QScintilla-gpl-${PV/_pre/-snapshot-}"
+inherit eutils multilib qt4-r2
+
+DESCRIPTION="Qt port of Neil Hodgson's Scintilla C++ editor class"
+HOMEPAGE="https://riverbankcomputing.com/software/qscintilla/intro"
+SRC_URI="https://www.riverbankcomputing.co.uk/static/Downloads/QScintilla2/${MY_P}.tar.gz
+mirror://kde-sunset/${MY_P}.tar.gz"
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
+IUSE="doc"
+
+RDEPEND="dev-qt/qtgui:4"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+
+PATCHES=( "${FILESDIR}/${PN}-2.4-designer.patch" )
+
+src_configure() {
+	cd "${S}"/Qt4
+	eqmake4 qscintilla.pro
+
+	cd "${S}"/designer-Qt4
+	eqmake4 designer.pro
+}
+
+src_compile() {
+	cd "${S}"/Qt4
+	emake all staticlib || die "emake failed"
+
+	cd "${S}"/designer-Qt4
+	emake || die "failed to build designer plugin"
+}
+
+src_install() {
+	cd "${S}"/Qt4
+	# header files
+	insinto /usr/include/Qsci
+	doins Qsci/*.h || die
+	# libraries
+	dolib.so libqscintilla2.so* || die
+	dolib.a libqscintilla2.a || die
+	# translations
+	insinto /usr/share/${PN}/translations
+	doins qscintilla_*.qm || die
+	for trans in $(ls -1 qscintilla_*.qm); do
+		dosym /usr/share/${PN}/translations/${trans} \
+			/usr/share/qt4/translations/${trans} || die
+	done
+
+	# designer plugin
+	cd "${S}"/designer-Qt4
+	emake INSTALL_ROOT="${D}" install || die "designer plugin installation failed"
+
+	# documentation
+	cd "${S}"
+	dodoc ChangeLog NEWS
+	if use doc; then
+		dohtml doc/html-Qt4/* || die
+		insinto /usr/share/doc/${PF}/Scintilla
+		doins doc/Scintilla/* || die
+	fi
+}
+
+pkg_postinst() {
+	ewarn "Please remerge dev-python/PyQt4 if you have problems with eric or other"
+	ewarn "qscintilla related packages before submitting bug reports."
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/kde-sunset:master commit in: x11-libs/qscintilla/
@ 2020-12-07 18:19 Andreas Sturmlechner
  0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2020-12-07 18:19 UTC (permalink / raw
  To: gentoo-commits

commit:     7eccef347ab4112592d25f3254f029184e06efd4
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  7 16:16:37 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec  7 16:36:32 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=7eccef34

x11-libs/qscintilla: EAPI-7, qmake-utils, drop qt4-r2, SLOT="0-qt4"

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...illa-2.4-r1.ebuild => qscintilla-2.4-r2.ebuild} | 59 ++++++++++++----------
 1 file changed, 32 insertions(+), 27 deletions(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.4-r1.ebuild b/x11-libs/qscintilla/qscintilla-2.4-r2.ebuild
similarity index 56%
rename from x11-libs/qscintilla/qscintilla-2.4-r1.ebuild
rename to x11-libs/qscintilla/qscintilla-2.4-r2.ebuild
index 6b21dc52..af90cb3d 100644
--- a/x11-libs/qscintilla/qscintilla-2.4-r1.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.4-r2.ebuild
@@ -1,71 +1,76 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
+EAPI=7
 
 MY_P="QScintilla-gpl-${PV/_pre/-snapshot-}"
-inherit eutils multilib qt4-r2
+inherit qmake-utils
 
 DESCRIPTION="Qt port of Neil Hodgson's Scintilla C++ editor class"
 HOMEPAGE="https://riverbankcomputing.com/software/qscintilla/intro"
 SRC_URI="https://www.riverbankcomputing.co.uk/static/Downloads/QScintilla2/${MY_P}.tar.gz
 mirror://kde-sunset/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
 
 LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
+SLOT="0-qt4"
 KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="doc"
 
-RDEPEND="dev-qt/qtgui:4"
-DEPEND="${RDEPEND}"
+DEPEND="dev-qt/qtgui:4"
+RDEPEND="${DEPEND}
+	!<x11-libs/qscintilla-2.4-r2:0
+"
 
-S="${WORKDIR}"/${MY_P}
+DOCS=( ChangeLog NEWS )
 
 PATCHES=( "${FILESDIR}/${PN}-2.4-designer.patch" )
 
 src_configure() {
-	cd "${S}"/Qt4
+	cd "${S}"/Qt4 || die
 	eqmake4 qscintilla.pro
 
-	cd "${S}"/designer-Qt4
+	cd "${S}"/designer-Qt4 || die
 	eqmake4 designer.pro
 }
 
 src_compile() {
-	cd "${S}"/Qt4
-	emake all staticlib || die "emake failed"
+	cd "${S}"/Qt4 || die
+	emake all staticlib
 
-	cd "${S}"/designer-Qt4
-	emake || die "failed to build designer plugin"
+	cd "${S}"/designer-Qt4 || die
+	emake
 }
 
 src_install() {
-	cd "${S}"/Qt4
+	einstalldocs
+
+	cd "${S}"/Qt4 || die
 	# header files
 	insinto /usr/include/Qsci
-	doins Qsci/*.h || die
+	doins Qsci/*.h
 	# libraries
-	dolib.so libqscintilla2.so* || die
-	dolib.a libqscintilla2.a || die
+	dolib.so libqscintilla2.so*
+	dolib.a libqscintilla2.a
 	# translations
 	insinto /usr/share/${PN}/translations
-	doins qscintilla_*.qm || die
-	for trans in $(ls -1 qscintilla_*.qm); do
-		dosym /usr/share/${PN}/translations/${trans} \
-			/usr/share/qt4/translations/${trans} || die
+	doins qscintilla_*.qm
+	local qm
+	for qm in $(ls -1 qscintilla_*.qm); do
+		dosym ../../${PN}/translations/${qm} /usr/share/qt4/translations/${qm}
 	done
 
 	# designer plugin
-	cd "${S}"/designer-Qt4
-	emake INSTALL_ROOT="${D}" install || die "designer plugin installation failed"
+	cd "${S}"/designer-Qt4 || die
+	emake INSTALL_ROOT="${D}" install
 
 	# documentation
-	cd "${S}"
-	dodoc ChangeLog NEWS
+	cd "${S}" || die
 	if use doc; then
-		dohtml doc/html-Qt4/* || die
-		insinto /usr/share/doc/${PF}/Scintilla
-		doins doc/Scintilla/* || die
+		docinto html
+		dodoc -r doc/html-Qt4/.
+		docinto Scintilla
+		dodoc -r doc/Scintilla/.
 	fi
 }
 


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2020-12-07 18:19 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-27 22:21 [gentoo-commits] proj/kde-sunset:master commit in: x11-libs/qscintilla/ Roman v. Gemmeren
  -- strict thread matches above, loose matches on Subject: below --
2020-11-30  0:52 Andreas Sturmlechner
2020-11-30  0:52 Andreas Sturmlechner
2020-12-07 18:19 Andreas Sturmlechner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox