version bump, with some patch changes

(Portage version: 2.1.2_rc1-r1)

4 files changed, 98 insertions, 1 deletions

diff --git a/dev-python/qscintilla/ChangeLog b/dev-python/qscintilla/ChangeLog
index a1c994223d52..4d223df2bcf6 100644
--- a/dev-python/qscintilla/ChangeLog
+++ b/dev-python/qscintilla/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/qscintilla
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/ChangeLog,v 1.65 2006/05/20 20:01:33 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/ChangeLog,v 1.66 2006/11/14 13:48:15 caleb Exp $
+
+*qscintilla-1.7 (14 Nov 2006)
+
+  14 Nov 2006; Caleb Tennis <caleb@gentoo.org> +files/qscintilla-1.7.patch,
+  +qscintilla-1.7.ebuild:
+  version bump, with some patch changes
 
   20 May 2006; Tobias Scherbaum <dertobi123@gentoo.org>
   qscintilla-1.6.ebuild:
diff --git a/dev-python/qscintilla/files/digest-qscintilla-1.7 b/dev-python/qscintilla/files/digest-qscintilla-1.7
new file mode 100644
index 000000000000..c8f1f3a2db47
--- /dev/null
+++ b/dev-python/qscintilla/files/digest-qscintilla-1.7
@@ -0,0 +1,3 @@
+MD5 145321e9e3ae7d4edc7f2bf6954b6763 QScintilla1-1.71-gpl-1.7.tar.gz 1060310
+RMD160 a0715e7c7712ddd466fd0d810226d971aacf1e72 QScintilla1-1.71-gpl-1.7.tar.gz 1060310
+SHA256 3094fcff5ca5e9ea979e3d740213ac9d00a0a054d0604279c2061faf36b0558f QScintilla1-1.71-gpl-1.7.tar.gz 1060310
diff --git a/dev-python/qscintilla/files/qscintilla-1.7.patch b/dev-python/qscintilla/files/qscintilla-1.7.patch
new file mode 100644
index 000000000000..99eb91369f97
--- /dev/null
+++ b/dev-python/qscintilla/files/qscintilla-1.7.patch
@@ -0,0 +1,17 @@
+--- designer/designer.pro.orig	2006-11-14 08:35:36.000000000 -0500
++++ designer/designer.pro	2006-11-14 08:35:49.000000000 -0500
+@@ -3,10 +3,12 @@
+ 
+ TEMPLATE = lib
+ TARGET = qscintillaplugin
+-DESTDIR = $(QTDIR)/plugins/designer
++DESTDIR = .
+ 
+ CONFIG += qt warn_on release plugin
+ 
+ SOURCES += qscintillaplugin.cpp
+ 
+-LIBS += -lqscintilla
++LIBS += -L../qt -lqscintilla
++
++INCLUDEPATH += ../qt
diff --git a/dev-python/qscintilla/qscintilla-1.7.ebuild b/dev-python/qscintilla/qscintilla-1.7.ebuild
new file mode 100644
index 000000000000..4c27514a63cc
--- /dev/null
+++ b/dev-python/qscintilla/qscintilla-1.7.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/qscintilla-1.7.ebuild,v 1.1 2006/11/14 13:48:15 caleb Exp $
+
+inherit eutils toolchain-funcs
+
+QSCINTILLA_MAJOR_VER="1"
+SCINTILLA_VER="1.71"
+MY_P="${PN/qs/QS}1-${SCINTILLA_VER}-gpl-${PV}"
+MY_P=${MY_P/_pre/snapshot-}
+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.river-bank.demon.co.uk/download/snapshots/QScintilla/${MY_P}.tar.gz"
+SRC_URI="http://www.riverbankcomputing.com/Downloads/QScintilla1/${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"
+IUSE="doc"
+
+DEPEND="=x11-libs/qt-3*"
+
+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
+
+	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
+}
+
+src_compile() {
+	cd ${S}/qt
+	make all staticlib CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINK="$(tc-getCXX)" || die "make failed"
+	cd ${S}/designer
+	dodir ${QTDIR}/plugins/designer
+	make
+}
+
+src_install() {
+	dodoc ChangeLog LICENSE NEWS README*
+	dodir ${ROOT}/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 -d 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
+}