Version bump

Package-Manager: portage-2.1.5.2

3 files changed, 151 insertions, 2 deletions

diff --git a/x11-libs/qscintilla/ChangeLog b/x11-libs/qscintilla/ChangeLog
index 8ce73a684265..b101c075810c 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.8 2008/05/12 15:12:03 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.9 2008/05/24 22:38:50 yngwin Exp $
+
+*qscintilla-2.2 (24 May 2008)
+
+  24 May 2008; Ben de Groot <yngwin@gentoo.org> +qscintilla-2.2.ebuild:
+  Version bump
 
   12 May 2008; Markus Rothe <corsair@gentoo.org> qscintilla-2.1-r1.ebuild:
   Stable on ppc64
diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 34fbfeba1e30..5ae29949fe3d 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -4,9 +4,11 @@ AUX qscintilla-2.1-qt.patch 351 RMD160 99756fe8a0105c649c7666609625f942e2ff502c
 AUX qscintilla-2.1-qt4.patch 443 RMD160 d226eb16020ba1288e1b3c0fe418601f5134bd40 SHA1 14092204c892dbb19c1749ae629bf06944dc4cbb SHA256 0ca4ad564038c6241b80e3a48d444fd5431b478e964ab41100221580c8674a22
 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-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 2301 RMD160 db738559013576467202a3c52383ba74a0c6524a SHA1 36fb7fedcf14676a6b009c80fc5667c387c11218 SHA256 e393b619c84b32c9bbf8f5eeb0fbbad0599fa34da14d045c3948d77ee7fbd6b1
 EBUILD qscintilla-2.1-r1.ebuild 3895 RMD160 a0612558e12afc97ba320add4bcdf73a4107032f SHA1 f1c887b5da51fb586d922f41e64f53c50df91476 SHA256 c79824dc4b98966998d77d5c7ad6c1600c27f6578e57271b009c6a18534c539e
-MISC ChangeLog 11883 RMD160 d2a66956c458f709710703919f0d4e5b858c4448 SHA1 646f7c256aee4e8551c370862e4000d7640f4864 SHA256 cdb4e7e047ae295fe47e1422e34e86e720f50e0ed2b0660b0931ffcf793b390c
+EBUILD qscintilla-2.2.ebuild 3852 RMD160 4bf262415d4705e18c6922ccac18e965992fff69 SHA1 eff2655dcb77ab0c4ca3581014df88bb90bfe2d1 SHA256 9b62695535244af133dffabcd46def8ad50172eb00baa4e6d1307d173ef999f1
+MISC ChangeLog 12001 RMD160 d8f5767bdbf6f7958765181920ac6bfc14eda35a SHA1 a06ce0038990407b3172400584fa89ce4b79c786 SHA256 9009d30efd5a2c93ce23ba8412d978d4f6941e432558b3465ae14d30856f1f1e
 MISC metadata.xml 175 RMD160 74ecde8b999da503a2733b49ed618d5d50d26476 SHA1 ec86e15b85c2bc4429ad67bb52238b44f2b16cbd SHA256 26b18db06b1665422af8905fb70f8f48920a048578172d62b9689e273ee39a2d
diff --git a/x11-libs/qscintilla/qscintilla-2.2.ebuild b/x11-libs/qscintilla/qscintilla-2.2.ebuild
new file mode 100644
index 000000000000..1434152f8868
--- /dev/null
+++ b/x11-libs/qscintilla/qscintilla-2.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.2.ebuild,v 1.1 2008/05/24 22:38:50 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"
+#SRC_URI="mirror://gentoo/${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 )
+	)
+	!qt4? ( x11-libs/qt:3 )"
+# 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}/${P}-qt4.patch"
+	else
+		epatch "${FILESDIR}/${P}-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."
+}