Version bump

(Portage version: 2.1.5.2)

2 files changed, 148 insertions, 1 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/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."
+}