summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Lohrke <carlo@gentoo.org>2004-05-25 13:22:45 +0000
committerCarsten Lohrke <carlo@gentoo.org>2004-05-25 13:22:45 +0000
commit8654afecf11878c45add081b116f2c6959e1040c (patch)
treea89096999b1aecce016c6b21016d724580fb5ff8 /dev-python/PyQt
parentAdded static support for adding mod_ldap. (Manifest recommit) (diff)
downloadgentoo-2-8654afecf11878c45add081b116f2c6959e1040c.tar.gz
gentoo-2-8654afecf11878c45add081b116f2c6959e1040c.tar.bz2
gentoo-2-8654afecf11878c45add081b116f2c6959e1040c.zip
removed 3.10, marked 3.8.1 stable on alpha and ppc
Diffstat (limited to 'dev-python/PyQt')
-rw-r--r--dev-python/PyQt/ChangeLog6
-rw-r--r--dev-python/PyQt/Manifest17
-rw-r--r--dev-python/PyQt/PyQt-3.10.ebuild58
-rw-r--r--dev-python/PyQt/PyQt-3.8.1.ebuild4
-rw-r--r--dev-python/PyQt/files/PyQt-3.10-qt-3.3.patch14
-rw-r--r--dev-python/PyQt/files/digest-PyQt-3.101
6 files changed, 14 insertions, 86 deletions
diff --git a/dev-python/PyQt/ChangeLog b/dev-python/PyQt/ChangeLog
index d205f39f8629..721f0dac0516 100644
--- a/dev-python/PyQt/ChangeLog
+++ b/dev-python/PyQt/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-python/PyQt
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/ChangeLog,v 1.34 2004/05/04 11:08:54 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/ChangeLog,v 1.35 2004/05/25 13:22:45 carlo Exp $
+
+ 25 May 2004; Carsten Lohrke <carlo@gentoo.org> PyQt-3.10.ebuild,
+ PyQt-3.8.1.ebuild, files/PyQt-3.10-qt-3.3.patch:
+ removed 3.10, marked 3.8.1 stable on alpha and ppc
04 May 2004; Bryan Østergaard <kloeri@gentoo.org> PyQt-3.5.ebuild:
Add missing IUSE.
diff --git a/dev-python/PyQt/Manifest b/dev-python/PyQt/Manifest
index eea3ee2632da..3ff567627ca3 100644
--- a/dev-python/PyQt/Manifest
+++ b/dev-python/PyQt/Manifest
@@ -1,14 +1,11 @@
+MD5 dfff044a0e491e0b1be69354a7b0156c PyQt-3.5.ebuild 1164
MD5 03b82b23eb727663b68b33809f800ce8 PyQt-3.11.ebuild 1487
-MD5 4303717e08e758f64b0f2ff0db2086b2 PyQt-3.10.ebuild 1705
-MD5 5b7d2b984661af24fee87068b90c717c PyQt-3.8.1.ebuild 1722
+MD5 e32f09d6d92c66170e9947bb0c9ddc0b PyQt-3.8.1.ebuild 1720
+MD5 646edac633ab759820b14b522a836c32 ChangeLog 4471
MD5 811c07ba7510a315382249fc3adb44fc metadata.xml 175
-MD5 dfff044a0e491e0b1be69354a7b0156c PyQt-3.5.ebuild 1164
-MD5 9ba7818494bf317d3c0cab6a51ae5372 ChangeLog 4299
-MD5 cfa5b5c9a44fc587bc3937b2d1335bb9 files/digest-PyQt-3.5 68
-MD5 b7a163cf6c16bcf3dbb9095827bb527f files/PyQt-3.10-qt-3.3.patch 294
-MD5 3fa2049e4d6038c8e02e2069f072cd60 files/digest-PyQt-3.8.1 70
-MD5 7323b7d1c141a1f065cb1b8646bec695 files/license-3.8.1.diff 960
-MD5 e548a5df6315f902d96d5b2d5afc2901 files/digest-PyQt-3.11 69
MD5 94164eef52f16b805d3c252c02100d11 files/qt3.1.2-compilation-fix-3.5.diff 2151
+MD5 e548a5df6315f902d96d5b2d5afc2901 files/digest-PyQt-3.11 69
+MD5 3fa2049e4d6038c8e02e2069f072cd60 files/digest-PyQt-3.8.1 70
+MD5 cfa5b5c9a44fc587bc3937b2d1335bb9 files/digest-PyQt-3.5 68
MD5 c5e3a3d6c377558ef966905f47c9c947 files/PyQt-3.8.1-qt-3.3.patch 280
-MD5 4bd3f02e83b155d77c50cc023c3d42ba files/digest-PyQt-3.10 69
+MD5 7323b7d1c141a1f065cb1b8646bec695 files/license-3.8.1.diff 960
diff --git a/dev-python/PyQt/PyQt-3.10.ebuild b/dev-python/PyQt/PyQt-3.10.ebuild
deleted file mode 100644
index 630f28f401dc..000000000000
--- a/dev-python/PyQt/PyQt-3.10.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/PyQt-3.10.ebuild,v 1.4 2004/04/25 21:09:26 vapier Exp $
-
-inherit distutils eutils
-
-MY_P="PyQt-x11-gpl-${PV}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="set of Python bindings for the QT 3.x Toolkit"
-HOMEPAGE="http://www.riverbankcomputing.co.uk/pyqt/"
-SRC_URI="http://www.river-bank.demon.co.uk/download/PyQt/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
-IUSE=""
-PV_MAJOR=${PV/.*/}
-PV_MINOR=${PV#${PV_MAJOR}.}
-PV_MINOR=${PV_MINOR/.*}
-
-DEPEND="virtual/glibc
- sys-devel/libtool
- x11-libs/qt
- dev-lang/python
- >=dev-python/sip-${PV_MAJOR}.${PV_MINOR}
- >=dev-python/qscintilla-1.54"
-
-src_compile() {
- distutils_python_version
-
- # fix qt-3.3 compile problem
- if has_version '=x11-libs/qt-3.3*' ; then
- epatch "${FILESDIR}/${P}-qt-3.3.patch"
- fi
-
- # standard qt sandbox problem workaround
- [ -d "$QTDIR/etc/settings" ] && addwrite "$QTDIR/etc/settings"
- dodir /usr/lib/python${PYVER}/site-packages /usr/include/python${PYVER} /usr/bin /usr/share/sip
- cd ${S}
- sed -i -e "s/ check_license()/# check_license()/" configure.py
- python configure.py \
- -d ${D}usr/lib/python${PYVER}/site-packages \
- -b ${D}usr/bin \
- -v ${D}usr/share/sip \
- -c
- make || die
-}
-
-src_install() {
- make install || die
- dodoc ChangeLog LICENSE NEWS README README.Linux README.SunOS THANKS
- dodir /usr/share/doc/${P}/
- mv ${D}/usr/share/doc/* ${D}/usr/share/doc/${P}/
- insinto /usr/share/sip
- doins ${S}/sip/*
- echo "/${D//\//\\/}/s//\//" > fixpaths.sed
- sed -i -f fixpaths.sed ${D}usr/lib/python${PYVER}/site-packages/pyqtconfig.py
-}
diff --git a/dev-python/PyQt/PyQt-3.8.1.ebuild b/dev-python/PyQt/PyQt-3.8.1.ebuild
index 687546661cd5..37928a51ed44 100644
--- a/dev-python/PyQt/PyQt-3.8.1.ebuild
+++ b/dev-python/PyQt/PyQt-3.8.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/PyQt-3.8.1.ebuild,v 1.7 2004/04/25 21:10:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/PyQt-3.8.1.ebuild,v 1.8 2004/05/25 13:22:45 carlo Exp $
inherit distutils eutils
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/PyQt-x11-gpl-${PV}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="x86 ~ppc sparc ~alpha"
+KEYWORDS="x86 ppc sparc alpha"
IUSE=""
PV_MAJOR=${PV/.*/}
diff --git a/dev-python/PyQt/files/PyQt-3.10-qt-3.3.patch b/dev-python/PyQt/files/PyQt-3.10-qt-3.3.patch
deleted file mode 100644
index 3299d2daeede..000000000000
--- a/dev-python/PyQt/files/PyQt-3.10-qt-3.3.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- PyQt-x11-gpl-3.10/sip/qttable/qtable.sip~ 2004-02-25 23:13:59.054964424 +0100
-+++ PyQt-x11-gpl-3.10/sip/qttable/qtable.sip 2004-02-25 23:14:30.527179920 +0100
-@@ -168,11 +168,6 @@
-
- virtual int rtti() const;
- %End
--
--protected:
--%If (Qt_3_2_0 -)
-- QString content() const;
--%End
- };
-
-
diff --git a/dev-python/PyQt/files/digest-PyQt-3.10 b/dev-python/PyQt/files/digest-PyQt-3.10
deleted file mode 100644
index 6ac9c855e9ee..000000000000
--- a/dev-python/PyQt/files/digest-PyQt-3.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1c00fef65b7bbc729b9e70ea1a386875 PyQt-x11-gpl-3.10.tar.gz 739693