version bump

(Portage version: 2.1.3.7)

5 files changed, 193 insertions, 1 deletions

diff --git a/dev-python/qscintilla/ChangeLog b/dev-python/qscintilla/ChangeLog
index e29cdd4f4410..9d344d21703b 100644
--- a/dev-python/qscintilla/ChangeLog
+++ b/dev-python/qscintilla/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/qscintilla
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/ChangeLog,v 1.75 2007/08/13 20:41:23 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/ChangeLog,v 1.76 2007/09/07 13:25:05 hawking Exp $
+
+*qscintilla-2.1 (07 Sep 2007)
+
+  07 Sep 2007; Ali Polatel <hawking@gentoo.org>
+  +files/qscintilla-2.1-qt.patch, +files/qscintilla-2.1-qt4.patch,
+  +qscintilla-2.1.ebuild:
+  version bump. thanks to everyone on bug 158116 and jokey
 
   13 Aug 2007; Tobias Scherbaum <dertobi123@gentoo.org>
   qscintilla-1.7.1.ebuild:
diff --git a/dev-python/qscintilla/files/digest-qscintilla-2.1 b/dev-python/qscintilla/files/digest-qscintilla-2.1
new file mode 100644
index 000000000000..8a883cf2944f
--- /dev/null
+++ b/dev-python/qscintilla/files/digest-qscintilla-2.1
@@ -0,0 +1,3 @@
+MD5 13049717628391ca4db43f7ede0eeeb4 QScintilla-1.73-gpl-2.1.tar.gz 1866929
+RMD160 ef114b468b3cea5d36346c915bc407ce2ad3ec65 QScintilla-1.73-gpl-2.1.tar.gz 1866929
+SHA256 545fcefb75fe159b48e2a17485c12ba8ca548f387f594923664258b10831bf86 QScintilla-1.73-gpl-2.1.tar.gz 1866929
diff --git a/dev-python/qscintilla/files/qscintilla-2.1-qt.patch b/dev-python/qscintilla/files/qscintilla-2.1-qt.patch
new file mode 100644
index 000000000000..3579ea2400af
--- /dev/null
+++ b/dev-python/qscintilla/files/qscintilla-2.1-qt.patch
@@ -0,0 +1,14 @@
+--- designer.pro.orig	2006-09-16 09:07:21.000000000 -0700
++++ designer.pro	2007-06-24 18:57:47.000000000 -0700
+@@ -5,8 +5,10 @@
+ TARGET = qscintillaplugin
+ DESTDIR = $(QTDIR)/plugins/designer
+ 
++INCLUDEPATH = ../Qt3
++
+ CONFIG += qt warn_on release plugin
+ 
+ SOURCES += qscintillaplugin.cpp
+ 
+-LIBS += -lqscintilla2
++LIBS += -L../Qt3/lib -lqscintilla2
diff --git a/dev-python/qscintilla/files/qscintilla-2.1-qt4.patch b/dev-python/qscintilla/files/qscintilla-2.1-qt4.patch
new file mode 100644
index 000000000000..646e38f45dbb
--- /dev/null
+++ b/dev-python/qscintilla/files/qscintilla-2.1-qt4.patch
@@ -0,0 +1,19 @@
+--- designer.pro.ori	2006-12-13 09:31:54.000000000 +0700
++++ designer.pro	2006-12-13 09:40:49.000000000 +0700
+@@ -4,12 +4,14 @@
+ TEMPLATE = lib
+ TARGET = qscintillaplugin
+ 
++INCLUDEPATH = ../Qt4
++
+ CONFIG += designer release plugin
+ 
+ HEADERS = qscintillaplugin.h
+ SOURCES = qscintillaplugin.cpp
+ 
+-target.path = $$[QT_INSTALL_PLUGINS]/designer
++target.path = .
+ INSTALLS += target
+ 
+-LIBS += -lqscintilla2
++LIBS += -L../Qt4/lib -lqscintilla2
diff --git a/dev-python/qscintilla/qscintilla-2.1.ebuild b/dev-python/qscintilla/qscintilla-2.1.ebuild
new file mode 100644
index 000000000000..c30c8df87fe3
--- /dev/null
+++ b/dev-python/qscintilla/qscintilla-2.1.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/qscintilla-2.1.ebuild,v 1.1 2007/09/07 13:25:05 hawking Exp $
+
+inherit eutils toolchain-funcs python
+
+SCINTILLA_VER="1.73"
+MY_P="${PN/qs/QS}-${SCINTILLA_VER}-gpl-${PV}"
+S=${WORKDIR}/${MY_P}
+
+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/QScintilla2/${MY_P}.tar.gz"
+#SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="qt4 python doc examples debug"
+
+RDEPEND="qt4? ( =x11-libs/qt-4* )
+		!qt4? ( =x11-libs/qt-3* )
+		python? ( dev-lang/python
+				qt4? ( dev-python/PyQt4 )
+				!qt4? ( dev-python/PyQt )
+				)"
+
+src_unpack() {
+	unpack ${A}
+
+	if use qt4; then
+		cd ${S}/Qt4
+		sed -i -e "s:DESTDIR = \$(QTDIR)/lib:DESTDIR = lib:" qscintilla.pro
+		sed -i -e "s:DESTDIR = \$\$\[QT_INSTALL_LIBS\]:DESTDIR = lib:" qscintilla.pro
+		echo -e "\nQMAKE_CFLAGS_RELEASE=${CFLAGS} -w\nQMAKE_CXXFLAGS_RELEASE=${CXXFLAGS} -w\nQMAKE_LFLAGS_RELEASE=${LDFLAGS}" >> qscintilla.pro
+		/usr/bin/qmake -o Makefile qscintilla.pro
+
+		cd ${S}/designer-Qt4
+		epatch ${FILESDIR}/${P}-qt4.patch
+
+		echo -e "\nQMAKE_CFLAGS_RELEASE=${CFLAGS} -w\nQMAKE_CXXFLAGS_RELEASE=${CXXFLAGS} -w\nQMAKE_LFLAGS_RELEASE=${LDFLAGS}" >> designer.pro
+		/usr/bin/qmake -o Makefile designer.pro
+	else
+		cd ${S}/Qt3
+		sed -i -e "s:DESTDIR = \$(QTDIR)/lib:DESTDIR = lib:" qscintilla.pro
+		sed -i -e "s:DESTDIR = \$\$\[QT_INSTALL_LIBS\]: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
+
+		cd ${S}/designer-Qt3
+		epatch ${FILESDIR}/${P}-qt.patch
+
+		sed -i -e "s:DESTDIR = \$(QTDIR)/plugins/designer:DESTDIR = .:" designer.pro
+		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
+	fi
+}
+
+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
+		if use python; then
+			cd ${S}/Python
+			python_version
+			einfo "Creating bindings for python-${PYVER} ..."
+			local myconf="-d \
+			/usr/$(get_libdir)/python${PYVER}/site-packages/PyQt4 \
+			-v /usr/share/sip \
+			-p 4 \
+			-n ../Qt4 \
+			-o ../Qt4/lib"
+			use debug && myconf="${myconf} -u"
+			${python} configure.py ${myconf}
+			emake || die "emake failed"
+		fi
+	else
+		cd ${S}/designer-Qt3
+		make DESTDIR=${D}/${QTDIR}/plugins/designer || die "make failed"
+		dodir ${QTDIR}/plugins/designer
+		if use python; then
+			cd ${S}/Python
+			python_version
+			einfo "Creating bindings for python-${PYVER} ..."
+			local myconf="-d \
+			/usr/$(get_libdir)/python${PYVER}/site-packages/ \
+			-v /usr/share/sip \
+				-p 3 \
+			-n ../Qt3 \
+			-o ../Qt3/lib"
+			use debug && myconf="${myconf} -u"
+			${python} configure.py ${myconf}
+			emake || die "emake failed"
+		fi
+	fi
+	make
+}
+
+src_install() {
+	dodoc ChangeLog LICENSE 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 lib/libqscintilla2.a* "${D}/usr/$(get_libdir)"
+	cp -d lib/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/lib/qt4/plugins/
+		insopts  -m0755
+		doins ${S}/designer-Qt4/libqscintillaplugin.so
+	else
+		insinto ${QTDIR}/plugins/designer
+		insopts  -m0755
+		doins ${S}/designer-Qt3/libqscintillaplugin.so
+	fi
+	if use python; then
+		cd ${S}/Python
+		make DESTDIR=${D} install || die "install failed"
+	fi
+}