Version bump

Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.27-hh5 i686

3 files changed, 151 insertions, 12 deletions

diff --git a/x11-libs/qscintilla/ChangeLog b/x11-libs/qscintilla/ChangeLog
index 2c3f377004f0..2e649e7030fc 100644
--- a/x11-libs/qscintilla/ChangeLog
+++ b/x11-libs/qscintilla/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/qscintilla
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.16 2008/10/11 22:59:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.17 2008/11/21 13:58:49 yngwin Exp $
+
+*qscintilla-2.3.2 (21 Nov 2008)
+
+  21 Nov 2008; Ben de Groot <yngwin@gentoo.org> +qscintilla-2.3.2.ebuild:
+  Version bump
 
   11 Oct 2008; Diego Pettenò <flameeyes@gentoo.org> qscintilla-2.3.ebuild:
   Fix build dependencies.
diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 0a45bf227de0..a33098886473 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX qscintilla-1.5-sandbox.patch 1041 RMD160 baf1c1ce082fdcead195941e4b3d3b2cfa48ce72 SHA1 f8625430db1692006e927f84110779786c281c2b SHA256 e1086b472285474fa3591a3bd9eb6b064a448e48d105f84b2fdd2c6977bcec8b
 AUX qscintilla-1.7.1.patch 398 RMD160 ebbd518a1bf6068f143fa902390ab772feea9627 SHA1 1bfb73303bab3251cf7351b6d6302c212880d705 SHA256 2aee04714bd2366326c21f2a559a6db4421e2e3e548811c72ee4d37e22e8873d
 AUX qscintilla-2.1-qt.patch 351 RMD160 99756fe8a0105c649c7666609625f942e2ff502c SHA1 6ef678ef5c345746295be78db700e8175dc2f682 SHA256 b6c4cdfc9af82ab04e885b2e30204e291391fe9111ed34dbe12a9af36e41ede9
@@ -10,19 +7,14 @@ AUX qscintilla-2.2-qt4.patch 439 RMD160 4c97b91aa538fa2db7da3e0b7f0f99766e8f98ed
 DIST QScintilla-1.71-gpl-1.7.1.tar.gz 1060119 RMD160 ba85db98e552b388510df5d1f7e0e78f52856ed2 SHA1 424415960e5cbcd58306e87d1d610bd8e72f3368 SHA256 437e5fc6e5905f9aa7d0f4ea8eb41c96fcddf7ce3cb9b786066a315c5b9ff70c
 DIST QScintilla-1.73-gpl-2.1.tar.gz 1866929 RMD160 ef114b468b3cea5d36346c915bc407ce2ad3ec65 SHA1 ca9ac61cc3d537d7b53202ff5d8565365c3f8734 SHA256 545fcefb75fe159b48e2a17485c12ba8ca548f387f594923664258b10831bf86
 DIST QScintilla-gpl-2.2.tar.gz 1873664 RMD160 8a1ad1dbad864d972259723cf308d2a779de346a SHA1 f570df8e7bcfc1281a477a21a12036023de6535a SHA256 307eef42f0f4910956f7260ab1f28752956b17af9014696a65660115cf3e7d37
+DIST QScintilla-gpl-2.3.2.tar.gz 2146902 RMD160 de7828d4b965156771034eb622ee9614b2aea9be SHA1 d34ae9907e6221d221c5b5c1324e9b263553d2cb SHA256 01318dd7745cf8d756683a60acf0f17f6c5c63edec0818f90c1c432d1bc27749
 DIST QScintilla-gpl-2.3.tar.gz 2126817 RMD160 9ecbc4d4ef9eddc1901152d4d0dcc08e7d704c01 SHA1 90c8c4b74e92b43fd8de350fe12f20c7f589e645 SHA256 43e051cb07b36b9cd455c781a421a8ed221a48d63455b6d00ea63be397be70c9
 DIST qscintilla-1.62-gpl-1.5.1.tar.gz 727606 RMD160 fe7fa31ec1ecbc7f4bbf887817830630dfbd5d88 SHA1 240bafd43f3f1f7c73f76daf98b23da3f071bc43 SHA256 5dfc860a8d91c15775ae03f40a57f0c26f51f90b8266236e457cb8cbb3f6e30e
 EBUILD qscintilla-1.5.1.ebuild 2059 RMD160 8601c92d2f113c4add903ed5400c69c3fc6e1d35 SHA1 13ff3539f6c610c0bb2b2c37dadaa7030fc15d89 SHA256 872125192997b3f4fa82c222ad1c66d39d284193446f93fb61254bb0d3e6f4bd
 EBUILD qscintilla-1.7.1.ebuild 2299 RMD160 99f53c4c41fc670e789f7ee55e5695adef29f3d3 SHA1 4a0b0e0aa66604d91d642082addc195684f51c9a SHA256 e3f092f98b44fde1a9de44a7ab2d6fa715206cd82e2967f46c311ed46ac37d59
 EBUILD qscintilla-2.1-r1.ebuild 3899 RMD160 881eb02bfbd2980a65564d3d9d3523dc9b1d78ad SHA1 675ec38bd144b30bee0918f87f86dc7d1fe9cae0 SHA256 ec144eb2eb750818cd83f7aa22601da211fb304b6639b91dfdf23dffed56207f
 EBUILD qscintilla-2.2.ebuild 3857 RMD160 7e23a9df40d99c41466b56315948ed3f6759390c SHA1 2a8b689d0da65ff93770ad79b033f21409a90585 SHA256 51b4418cd951886be38dfa3b4907bf17346e7fca2b6cfc4cf535a43b33ba1c51
+EBUILD qscintilla-2.3.2.ebuild 3848 RMD160 a083289eb7bfb1d674dbe9d69b3946506d86eefc SHA1 c9d10072886be8c681121896b27e7881e784cf57 SHA256 e788d5c4c04587e962d823559b6d2667e362d14e4f883787d4645cbae460c859
 EBUILD qscintilla-2.3.ebuild 3891 RMD160 c72559e488a59bc4c63a4354517389e9e1d13f56 SHA1 6bb488282ec3730136bead5adf1195cb0c5b42e0 SHA256 29a87b0e659ef37c16e3e2ba772328169629645a70049805e6592254586dd1ee
-MISC ChangeLog 12998 RMD160 04492573bad1a8745c2446830495491883bf1d77 SHA1 90fbdd937d5ffe9557105fb591f2f317c84787aa SHA256 a4c5b428c90e6b21e392523ee625aea53e30a950b006cc7bc53d4cc6aeb3a40b
+MISC ChangeLog 13118 RMD160 211f043f328531290c044abd63de9e10fac7182e SHA1 a4034ead520e337c5db0c755b1645a4709835822 SHA256 136ed45d4850bd6dbed716fa6f9ed615efd40e8e883336fdbc35a3774677acd3
 MISC metadata.xml 175 RMD160 74ecde8b999da503a2733b49ed618d5d50d26476 SHA1 ec86e15b85c2bc4429ad67bb52238b44f2b16cbd SHA256 26b18db06b1665422af8905fb70f8f48920a048578172d62b9689e273ee39a2d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkjxL74ACgkQAiZjviIA2XgRnACgoV8zXc4XdHNDVt9NxpQy18MN
-vg4AoJWZCka22P4ZuAYfZ2KJ7xwj5WVN
-=gQFI
------END PGP SIGNATURE-----
diff --git a/x11-libs/qscintilla/qscintilla-2.3.2.ebuild b/x11-libs/qscintilla/qscintilla-2.3.2.ebuild
new file mode 100644
index 000000000000..4e9a5fb9a1b3
--- /dev/null
+++ b/x11-libs/qscintilla/qscintilla-2.3.2.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2008 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.1 2008/11/21 13:58:49 yngwin Exp $
+
+EAPI=1
+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"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="qt4 +python doc examples debug"
+
+RDEPEND="qt4? ( || ( x11-libs/qt-gui:4
+		=x11-libs/qt-4.3*:4 )
+	)
+	!qt4? ( x11-libs/qt: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 )"
+
+src_unpack() {
+	unpack ${A}
+
+	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."
+}