Restore 1.7.1 for hppa

Package-Manager: portage-2.2_rc48/cvs/Linux x86_64
RepoMan-Options: --force

3 files changed, 78 insertions, 2 deletions

diff --git a/x11-libs/qscintilla/ChangeLog b/x11-libs/qscintilla/ChangeLog
index 6c08c943eb21..cdf4c010bdfc 100644
--- a/x11-libs/qscintilla/ChangeLog
+++ b/x11-libs/qscintilla/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/qscintilla
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.34 2009/11/04 17:44:32 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.35 2009/11/05 17:09:09 yngwin Exp $
+
+  05 Nov 2009; Ben de Groot <yngwin@gentoo.org> +qscintilla-1.7.1.ebuild:
+  Also restoring 1.7.1 for hppa.
 
   04 Nov 2009; Ben de Groot <yngwin@gentoo.org> +qscintilla-1.5.1.ebuild:
   Temporarily restoring 1.5.1 for stable dev-db/tora-1 users.
diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 5803f9049a1e..ff43826f7cef 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -5,11 +5,13 @@ AUX qscintilla-2.1-qt4.patch 443 RMD160 d226eb16020ba1288e1b3c0fe418601f5134bd40
 AUX qscintilla-2.2-qt.patch 347 RMD160 8585ed1b9e525b57663ed5f4e0b0c6500e9b9a7d SHA1 8b97babbbd05ad7d22b1a93c105ac83eaf57ea02 SHA256 9ef628c4546be47ba1eb32e13f2d56c40c0b8c26ea6990b979bc5c73540c9545
 AUX qscintilla-2.2-qt4.patch 439 RMD160 4c97b91aa538fa2db7da3e0b7f0f99766e8f98ed SHA1 84a6e4cab7aaed4d7ffa3286e7e31809ba0367f2 SHA256 9996813f9c512bc702c85dea920351770becfbdc9034f7b4babad41de8eea14d
 AUX qscintilla-2.4-designer.patch 1042 RMD160 cfb80962caed15e4bb6c290edcc35d1acfc861a0 SHA1 d5586a13545be09e2d2126b6fcbef2f172470429 SHA256 af6c15f8cdc64041ddd692480d6bcc7d6c59aa7c1c5b963707b4d31e60288d78
+DIST QScintilla-1.71-gpl-1.7.1.tar.gz 1060119 RMD160 ba85db98e552b388510df5d1f7e0e78f52856ed2 SHA1 424415960e5cbcd58306e87d1d610bd8e72f3368 SHA256 437e5fc6e5905f9aa7d0f4ea8eb41c96fcddf7ce3cb9b786066a315c5b9ff70c
 DIST QScintilla-gpl-2.3.2.tar.gz 2146902 RMD160 de7828d4b965156771034eb622ee9614b2aea9be SHA1 d34ae9907e6221d221c5b5c1324e9b263553d2cb SHA256 01318dd7745cf8d756683a60acf0f17f6c5c63edec0818f90c1c432d1bc27749
 DIST QScintilla-gpl-2.4.tar.gz 2304554 RMD160 19e5d5c331705c217c5192b1fcac5d298942db69 SHA1 17962bb64d2641f9e181b39fdca39228170488a3 SHA256 0497fef84763c6d8cbce570401f7ca38e439a76ee358e3050f8dada85adfb213
 DIST qscintilla-1.62-gpl-1.5.1.tar.gz 727606 RMD160 fe7fa31ec1ecbc7f4bbf887817830630dfbd5d88 SHA1 240bafd43f3f1f7c73f76daf98b23da3f071bc43 SHA256 5dfc860a8d91c15775ae03f40a57f0c26f51f90b8266236e457cb8cbb3f6e30e
 EBUILD qscintilla-1.5.1.ebuild 2056 RMD160 5b6eecfe28d4e20b9e477babb0bf119f05ffc7d6 SHA1 fc21b1bc30cb0c85b71b4b363b28a43d55f24c66 SHA256 b7263d9c3fdbbd5ef7af04ea09935f4477c1361798fe73f5a44a4cc1dec842e5
+EBUILD qscintilla-1.7.1.ebuild 2300 RMD160 96542d9c579ef2e81ea8ef1f893c0445a83fb136 SHA1 f0aa09572e6933dffd436c30547b4e4e68030154 SHA256 5d5a6b12c2dba8d784ddba803ada081312ccb144202fc6d18d80ca67a6213a23
 EBUILD qscintilla-2.3.2.ebuild 3805 RMD160 d6d41d1213cc5ba0873a0c63fb40ba272a990637 SHA1 b92f0e444fca0696d9b4d9067b785a8ece6b2fb1 SHA256 57d00e7cd62d83a35c62aca509fb396f80dd0ab97ddf17e33da4dcf4535dc1f9
 EBUILD qscintilla-2.4.ebuild 2414 RMD160 96af66677f51dee27f0ab965264327cbe19b7c5d SHA1 b909d75a5c93388b1e1b7d05efbb8de07875c291 SHA256 10bd9cbb7b670da9f2f3f84634fe3ce4f59981be25d0b232d3eb44bbe00e3ce4
-MISC ChangeLog 15186 RMD160 f296c8388168dc9394031014f119c02c7cc358f2 SHA1 4fc2b8b30c01f460bc6cd51cde116a0fd580fd44 SHA256 50e8476333137d3d9b098215f3c3eb418acea4d96a2f1dff379b45ce8999c56c
+MISC ChangeLog 15294 RMD160 4047bb4e3d2f3cb03d8510f63084d48f090f64cd SHA1 1e226d5df1e4c3b84470e0d35b34fce252139492 SHA256 b79718242bee81bb77215fc8a2fddb8bb4746024a3989bc590477f2424d07443
 MISC metadata.xml 175 RMD160 74ecde8b999da503a2733b49ed618d5d50d26476 SHA1 ec86e15b85c2bc4429ad67bb52238b44f2b16cbd SHA256 26b18db06b1665422af8905fb70f8f48920a048578172d62b9689e273ee39a2d
diff --git a/x11-libs/qscintilla/qscintilla-1.7.1.ebuild b/x11-libs/qscintilla/qscintilla-1.7.1.ebuild
new file mode 100644
index 000000000000..4ed12507a48b
--- /dev/null
+++ b/x11-libs/qscintilla/qscintilla-1.7.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-1.7.1.ebuild,v 1.4 2009/11/05 17:09:09 yngwin Exp $
+
+EAPI=1
+
+inherit eutils toolchain-funcs qt3
+
+SCINTILLA_VER="1.71"
+MY_P="${PN/qs/QS}-${SCINTILLA_VER}-gpl-${PV}"
+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"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="alpha ~amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="doc"
+
+DEPEND="x11-libs/qt:3"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}/qt"
+	sed -i -e "s:DESTDIR = \$(QTDIR)/lib:DESTDIR = lib:" 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 || die "qmake qscintilla failed"
+
+	cd "${S}"
+	epatch "${FILESDIR}/${P}.patch"
+
+	cd "${S}/designer"
+	echo -e "\nQMAKE_CFLAGS_RELEASE=${CFLAGS} -w\nQMAKE_CXXFLAGS_RELEASE=${CXXFLAGS} -w\nQMAKE_LFLAGS_RELEASE=${LDFLAGS}" >> designer.pro
+	${QTDIR}/bin/qmake -o Makefile designer.pro || die "qmake designer failed"
+}
+
+src_compile() {
+	cd "${S}/qt"
+	emake all staticlib CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINK="$(tc-getCXX)" || die "emake failed"
+	cd "${S}/designer"
+	dodir ${QTDIR}/plugins/designer
+	emake || die "emake designer failed"
+}
+
+src_install() {
+	dodoc ChangeLog NEWS README*
+	dodir /usr/{include,$(get_libdir),share/qscintilla/translations}
+	cd "${S}"/qt
+	cp qextscintilla*.h "${D}/usr/include"
+	cp qscintilla*.qm "${D}/usr/share/qscintilla/translations"
+	cp lib/libqscintilla.a* "${D}/usr/$(get_libdir)"
+	cp -R lib/libqscintilla.so.* "${D}/usr/$(get_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
+	insinto ${QTDIR}/plugins/designer
+	insopts  -m0755
+	doins "${S}"/designer/libqscintillaplugin.so
+}