public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in dev-python/qscintilla: ChangeLog qscintilla-2.1.ebuild
@ 2007-09-07 13:25 Ali Polatel (hawking)
  0 siblings, 0 replies; 3+ messages in thread
From: Ali Polatel (hawking) @ 2007-09-07 13:25 UTC (permalink / raw
  To: gentoo-commits

hawking     07/09/07 13:25:06

  Modified:             ChangeLog
  Added:                qscintilla-2.1.ebuild
  Log:
  version bump
  (Portage version: 2.1.3.7)

Revision  Changes    Path
1.76                 dev-python/qscintilla/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/qscintilla/ChangeLog?rev=1.76&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/qscintilla/ChangeLog?rev=1.76&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/qscintilla/ChangeLog?r1=1.75&r2=1.76

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/qscintilla/ChangeLog,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- ChangeLog	13 Aug 2007 20:41:23 -0000	1.75
+++ ChangeLog	7 Sep 2007 13:25:05 -0000	1.76
@@ -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:



1.1                  dev-python/qscintilla/qscintilla-2.1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/qscintilla/qscintilla-2.1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/qscintilla/qscintilla-2.1.ebuild?rev=1.1&content-type=text/plain

Index: qscintilla-2.1.ebuild
===================================================================
# 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
}



-- 
gentoo-commits@gentoo.org mailing list



^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-python/qscintilla: ChangeLog qscintilla-2.1.ebuild
@ 2007-09-09 21:50 Ali Polatel (hawking)
  0 siblings, 0 replies; 3+ messages in thread
From: Ali Polatel (hawking) @ 2007-09-09 21:50 UTC (permalink / raw
  To: gentoo-commits

hawking     07/09/09 21:50:53

  Modified:             ChangeLog qscintilla-2.1.ebuild
  Log:
  fix multilib issue (bug 191910), thanks to Kenneth Prugh
  (Portage version: 2.1.3.9)

Revision  Changes    Path
1.77                 dev-python/qscintilla/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/qscintilla/ChangeLog?rev=1.77&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/qscintilla/ChangeLog?rev=1.77&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/qscintilla/ChangeLog?r1=1.76&r2=1.77

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/qscintilla/ChangeLog,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- ChangeLog	7 Sep 2007 13:25:05 -0000	1.76
+++ ChangeLog	9 Sep 2007 21:50:53 -0000	1.77
@@ -1,6 +1,9 @@
 # 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.76 2007/09/07 13:25:05 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/ChangeLog,v 1.77 2007/09/09 21:50:53 hawking Exp $
+
+  09 Sep 2007; Ali Polatel <hawking@gentoo.org> qscintilla-2.1.ebuild:
+  Fix multilib issue (bug 191910), thanks to Kenneth Prugh
 
 *qscintilla-2.1 (07 Sep 2007)
 



1.2                  dev-python/qscintilla/qscintilla-2.1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/qscintilla/qscintilla-2.1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/qscintilla/qscintilla-2.1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/qscintilla/qscintilla-2.1.ebuild?r1=1.1&r2=1.2

Index: qscintilla-2.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/qscintilla/qscintilla-2.1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qscintilla-2.1.ebuild	7 Sep 2007 13:25:05 -0000	1.1
+++ qscintilla-2.1.ebuild	9 Sep 2007 21:50:53 -0000	1.2
@@ -1,8 +1,8 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/qscintilla-2.1.ebuild,v 1.2 2007/09/09 21:50:53 hawking Exp $
 
-inherit eutils toolchain-funcs python
+inherit eutils toolchain-funcs python multilib
 
 SCINTILLA_VER="1.73"
 MY_P="${PN/qs/QS}-${SCINTILLA_VER}-gpl-${PV}"
@@ -134,7 +134,7 @@
 		doins ${S}/doc/Scintilla/*
 	fi
 	if use qt4; then
-		insinto /usr/lib/qt4/plugins/
+		insinto /usr/$(get_libdir)/qt4/plugins/
 		insopts  -m0755
 		doins ${S}/designer-Qt4/libqscintillaplugin.so
 	else



-- 
gentoo-commits@gentoo.org mailing list



^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-python/qscintilla: ChangeLog qscintilla-2.1.ebuild
@ 2007-11-13  7:06 Jeroen Roovers (jer)
  0 siblings, 0 replies; 3+ messages in thread
From: Jeroen Roovers (jer) @ 2007-11-13  7:06 UTC (permalink / raw
  To: gentoo-commits

jer         07/11/13 07:06:26

  Modified:             ChangeLog qscintilla-2.1.ebuild
  Log:
  Marked ~hppa (bug #198456). Do not install LICENSE.
  (Portage version: 2.1.3.19)

Revision  Changes    Path
1.81                 dev-python/qscintilla/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/qscintilla/ChangeLog?rev=1.81&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/qscintilla/ChangeLog?rev=1.81&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/qscintilla/ChangeLog?r1=1.80&r2=1.81

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/qscintilla/ChangeLog,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- ChangeLog	8 Nov 2007 15:04:10 -0000	1.80
+++ ChangeLog	13 Nov 2007 07:06:25 -0000	1.81
@@ -1,6 +1,9 @@
 # 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.80 2007/11/08 15:04:10 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/ChangeLog,v 1.81 2007/11/13 07:06:25 jer Exp $
+
+  13 Nov 2007; Jeroen Roovers <jer@gentoo.org> qscintilla-2.1.ebuild:
+  Marked ~hppa (bug #198456). Do not install LICENSE.
 
   08 Nov 2007; Ali Polatel <hawking@gentoo.org> qscintilla-1.7.1.ebuild,
   qscintilla-2.1.ebuild:



1.5                  dev-python/qscintilla/qscintilla-2.1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/qscintilla/qscintilla-2.1.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/qscintilla/qscintilla-2.1.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/qscintilla/qscintilla-2.1.ebuild?r1=1.4&r2=1.5

Index: qscintilla-2.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/qscintilla/qscintilla-2.1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qscintilla-2.1.ebuild	8 Nov 2007 15:04:10 -0000	1.4
+++ qscintilla-2.1.ebuild	13 Nov 2007 07:06:25 -0000	1.5
@@ -1,6 +1,6 @@
 # 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.4 2007/11/08 15:04:10 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/qscintilla-2.1.ebuild,v 1.5 2007/11/13 07:06:25 jer Exp $
 
 inherit eutils toolchain-funcs python multilib
 
@@ -15,7 +15,7 @@
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="qt4 python doc examples debug"
 
 RDEPEND="qt4? ( =x11-libs/qt-4* )
@@ -105,7 +105,7 @@
 }
 
 src_install() {
-	dodoc ChangeLog LICENSE NEWS README*
+	dodoc ChangeLog NEWS README*
 	dodir /usr/{include,$(get_libdir),share/qscintilla/translations}
 	if use qt4; then
 		cd "${S}"/Qt4



-- 
gentoo-commits@gentoo.org mailing list



^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2007-11-13  7:06 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-09-07 13:25 [gentoo-commits] gentoo-x86 commit in dev-python/qscintilla: ChangeLog qscintilla-2.1.ebuild Ali Polatel (hawking)
  -- strict thread matches above, loose matches on Subject: below --
2007-09-09 21:50 Ali Polatel (hawking)
2007-11-13  7:06 Jeroen Roovers (jer)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox