9 files changed, 42 insertions, 311 deletions
diff --git a/dev-python/sip/ChangeLog b/dev-python/sip/ChangeLog
index 9cfc9841646b..f474ee8ae862 100644
--- a/dev-python/sip/ChangeLog
+++ b/dev-python/sip/ChangeLog
@@ -1,262 +1,11 @@
 # ChangeLog for dev-python/sip
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/ChangeLog,v 1.64 2005/11/25 22:03:32 tgall Exp $
-
-  25 Nov 2005; Tom Gall <tgall@gentoo.org> sip-4.1.1.ebuild:
-  stable on ppc64
-
-*sip-4.3.1 (23 Sep 2005)
-
-  23 Sep 2005; Chris Bainbridge <chrb@gentoo.org> +sip-4.3.1.ebuild:
-  Version bump, fixed LICENSE, bug #93575.
-
-  16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
-  Converted to UTF-8, fixed encoding screwups
-
-  26 Aug 2005; Aron Griffis <agriffis@gentoo.org> sip-4.2.1.ebuild:
-  add ~ia64
-
-  26 Jul 2005; Bryan Ãstergaard <kloeri@gentoo.org> sip-4.1.1.ebuild:
-  Stable on alpha.
-
-  21 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> sip-4.1.1.ebuild:
-  Stable on ppc.
-
-*sip-4.2.1 (07 Mar 2005)
-
-  07 Mar 2005; Carsten Lohrke <carlo@gentoo.org> +sip-4.2.1.ebuild:
-  version bump
-
-*sip-4.2 (20 Feb 2005)
-
-  20 Feb 2005; Carsten Lohrke <carlo@gentoo.org> +sip-4.2.ebuild:
-  version bump
-
-  07 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org> sip-4.1.1.ebuild:
-  Multilib fix for python.
-
-  31 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
-  Change encoding to UTF-8 for GLEP 31 compliance
-
-  19 Dec 2004; Carsten Lohrke <carlo@gentoo.org> sip-4.1.1.ebuild:
-  debug support, minor fixes
-
-  16 Dec 2004; Dylan Carlson <absinthe@gentoo.org> sip-4.1.1.ebuild:
-  Stable on amd64.
-
-  09 Dec 2004; Gustavo Zacarias <gustavoz@gentoo.org> sip-4.1.1.ebuild:
-  Stable on sparc
-
-  23 Nov 2004; Carsten Lohrke <carlo@gentoo.org> sip-4.1.1.ebuild:
-  stable on x86
-
-  08 Nov 2004; Daniel Ostrow <dostrow@gentoo.org> sip-4.1.1.ebuild:
-  Marked ~ppc64
-
-  25 Sep 2004; Jason Wever <weeve@gentoo.org> sip-4.0.1.ebuild:
-  Stable on sparc.
-
-*sip-3.11.1 (25 Sep 2004)
-
-  25 Sep 2004; Carsten Lohrke <carlo@gentoo.org> +sip-4.1.1.ebuild:
-  version bump
-
-*sip-3.11.1 (25 Sep 2004)
-
-  25 Sep 2004; Carsten Lohrke <carlo@gentoo.org> +sip-3.11.1.ebuild,
-  -sip-3.11.ebuild, -sip-4.1.ebuild:
-  version bump
-
-*sip-3.11 (20 Sep 2004)
-
-  20 Sep 2004; Carsten Lohrke <carlo@gentoo.org> +sip-3.11.ebuild,
-  +sip-4.1.ebuild, -sip-4.1_rc1.ebuild:
-  version bump
-
-  17 Sep 2004; Bryan Ãstergaard,,, <kloeri@gentoo.org> sip-4.1_rc1.ebuild:
-  Fix src_uri.
-
-*sip-4.1_rc1 (16 Sep 2004)
-
-  16 Sep 2004; Carsten Lohrke <carlo@gentoo.org> +sip-4.1_rc1.ebuild:
-  version bump
-
-*sip-3.8-r1 (31 Aug 2004)
-
-  31 Aug 2004; Bryan Ãstergaard,,, <kloeri@gentoo.org>
-  +files/license-3.8.diff, +sip-3.8-r1.ebuild:
-  Add back sip-3.8* as it's needed by PyQt-3.8.1.
-
-  30 Aug 2004; Carsten Lohrke <carlo@gentoo.org> -files/license-3.8.diff,
-  -sip-3.8-r1.ebuild, sip-4.0.1.ebuild, -sip-4.0.ebuild, -sip-4.0_rc2.ebuild,
-  -sip-4.0_rc4.ebuild:
-  4.0.1 stable on x86, ebuild clean up
-
-  21 Aug 2004; Danny van Dyk <kugelfang@gentoo.org> sip-4.0.1.ebuild:
-  Marked stable on amd64.
-
-*sip-3.10.2 (18 Jul 2004)
-
-  18 Jul 2004; Jason Wever <weeve@gentoo.org> sip-3.10.2.ebuild:
-  Stable on sparc wrt bug #56712.
-
-  18 Jul 2004; Bryan Ãstergaard <kloeri@gentoo.org> sip-3.10.2.ebuild:
-  Stable on alpha.
-
-  11 Jul 2004; Carsten Lohrke <carlo@gentoo.org> sip-3.10.2.ebuild:
-  stable on x86
-
-*sip-4.0.1 (06 Jul 2004)
-
-  06 Jul 2004; Carsten Lohrke <carlo@gentoo.org> +sip-4.0.1.ebuild:
-  version bump
-
-  01 Jul 2004; Jon Hood <squinky86@gentoo.org> sip-3.10.2.ebuild,
-  sip-3.8-r1.ebuild, sip-4.0.ebuild, sip-4.0_rc2.ebuild, sip-4.0_rc4.ebuild:
-  change virtual/glibc to virtual/libc
-
-*sip-4.0_rc2 (24 Jun 2004)
-
-  24 Jun 2004; Carsten Lohrke <carlo@gentoo.org> +sip-4.0_rc2.ebuild:
-  readd rc2 for amd64
-
-*sip-4.0 (23 Jun 2004)
-
-  23 Jun 2004; Carsten Lohrke <carlo@gentoo.org> -files/license-3.5.diff,
-  sip-3.10.2.ebuild, -sip-3.5.ebuild, sip-3.8-r1.ebuild, +sip-4.0.ebuild,
-  -sip-4.0_rc2.ebuild, sip-4.0_rc4.ebuild:
-  version bump, QA
-
-  25 May 2004; Carsten Lohrke <carlo@gentoo.org> sip-3.10.1.ebuild,
-  sip-3.10.ebuild, sip-3.5.ebuild, sip-3.8-r1.ebuild, sip-3.8.ebuild,
-  sip-4.0_rc1.ebuild, sip-4.0_rc2.ebuild, sip-4.0_rc3.ebuild:
-  mirror://gentoo fixes, cleanup,
-  marked sip-3.8-r1 stable on alpha
-
-*sip-4.0_rc4 (22 May 2004)
-
-  22 May 2004; Carsten Lohrke <carlo@gentoo.org> sip-3.10.2.ebuild,
-  sip-4.0_rc4.ebuild:
-  version bump and ebuild clean up
-
-  29 Mar 2004; Martin Holzer <mholzer@gentoo.org> files/license-3.5.diff:
-  adding license. closes 46144
-
-  29 Mar 2004; Luca Barbato <lu_zero@gentoo.org> sip-3.8-r1.ebuild:
-  Marked ppc, the 3.5 is broken.
-
-*sip-4.0_rc3 (17 Mar 2004)
-
-  17 Mar 2004; Caleb Tennis <caleb@gentoo.org> sip-4.0_rc3.ebuild:
-  New rc version
-
-*sip-3.10.1 (17 Mar 2004)
-
-  17 Mar 2004; Caleb Tennis <caleb@gentoo.org> sip-3.10.1.ebuild,
-  sip-3.10.ebuild:
-  Latest version w/ bugfixes
-
-  27 Feb 2004; Sven Blumenstein <bazik@gentoo.org> sip-3.8-r1.ebuild:
-  Stable on sparc.
-
-  26 Feb 2004; Sven Blumenstein <bazik@gentoo.org> sip-3.8.ebuild:
-  Stable on sparc.
-
-  26 Feb 2004; <kloeri@gentoo.org> sip-3.8-r1.ebuild:
-  Oops, install both binaries and headerfiles.
-
-*sip-3.8-r1 (26 Feb 2004)
-
-  26 Feb 2004; <kloeri@gentoo.org> sip-3.8-r1.ebuild:
-  sip-3.8 didn't install all files, see bug #42047.
-
-  30 Jan 2004; Brian Harring <ferringb@gentoo.org> sip-3.5.ebuild,
-  sip-3.8.ebuild, sip-4.0_rc1.ebuild, sip-4.0_rc2.ebuild:
-  Updated sip-3.8 w/ a mirror://gentoo url, due to it being removed upstream.
-  Copyright date fixes, removed sip-3.9 due to lack of upstream src.
-
-*sip-3.10 (17 Jan 2004)
-
-  17 Jan 2004; Rob Cakebread <pythonhead@gentoo.org> sip-3.10.ebuild:
-  Version bump. Bug# 38533. Thanks Carlo <current@myrealbox.com>
-
-*sip-4.0_rc2 (17 Jan 2004)
-
-  17 Jan 2004; Rob Cakebread <pythonhead@gentoo.org> sip-4.0_rc2.ebuild:
-  Version bump
-
-*sip-3.5 (25 Dec 2003)
-
-  25 Dec 2003; Bryan Ãstergaard,,, <kloeri@gentoo.org> sip-3.5.ebuild:
-  Re-add sip-3.5.ebuild to satisfy PyQt dependency
-
-  17 Dec 2003; Caleb Tennis <caleb@gentoo.org> sip-3.5.ebuild, sip-3.6.ebuild,
-  sip-3.7.ebuild, sip-3.9.ebuild, sip-4.0_rc1.ebuild, files/license-3.5.diff,
-  files/license-3.6.diff, files/license-3.7.diff:
-  Some fixes for 3.9 and 4.0_rc1 as noted in bug #35368
-  Removed older sips (not available anymore via download anyway)
-
-*sip-4.0_rc1 (08 Dec 2003)
-
-  08 Dec 2003; Caleb Tennis <caleb@gentoo.org> sip-3.9.ebuild, sip-4.0_rc1.ebuild:
-  New versions - thanks Carlo (bug #35368)
-
-  10 Nov 2003; Caleb Tennis <caleb@gentoo.org> sip-3.8.ebuild:
-  x86 stable
-
-*sip-3.8 (27 Aug 2003)
-
-  27 Aug 2003; Caleb Tennis <caleb@gentoo.org> sip-3.8.ebuild:
-  Version bump
-
-*sip-3.7 (30 Jul 2003)
-
-  30 Jul 2003; Caleb Tennis <caleb@gentoo.org> sip-3.7.ebuild:
-  Version bump
-
-*sip-3.6 (29 Apr 2003)
-
-  29 Apr 2003; Michele Balistreri <brain@gentoo.org> sip-3.6.ebuild :
-  Version bump
-
-*sip-3.5 (14 Dec 2002)
-
-  04 Apr 2003; Alastair Tse <liquidx@gentoo.org> sip-3.5.ebuild,
-  files/license-3.5.diff:
-  patch cleanups
-
-  04 Apr 2003; Alastair Tse <liquidx@gentoo.org> sip-3.5.ebuild :
-  changelog cleanup, ebuild cleanup.
-
-  14 Dec 2002; Bart Verwilst <verwilst@gentoo.org> :
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> :
-  changed sparc ~sparc keywords
-
-*sip-3.4 (18 Sep 2002)
-
-  18 Sep 2002; Sascha Schwabbauer <cybersystem@gentoo.org> :
-  Added ppc to keywords.
-
-  25 Jul 2003; Bart Verwilst <verwilst@gentoo.org> :
-
-*sip-3.3.2 (25 Jul 2002)
-
-  25 Jul 2002; Bart Verwilst <verwilst@gentoo.org> :
-
-*sip-3.2.4 (5 July 2002)
-
-  5 Jul 2002; Bart Verwilst <verwilst@gentoo.org> :
-
-*sip-3.2.1 (5 May 2002)
-
-  5 May 2002; B.Verwilst <verwilst@gentoo.org> ChangeLog :
-  New version, needed by PyQt 3.2
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/ChangeLog,v 1.1 2002/02/01 21:53:28 gbevin Exp $
 
 *sip-3.0 (1 Feb 2002)
 
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-
+  
   Added initial ChangeLog which should be updated whenever the package is
   updated in any way. This changelog is targetted to users. This means that the
   comments should well explained and written in clean English. The details about
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index c4fca040d8cc..9c4b87233e5b 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,19 +1,7 @@
-MD5 d397ac189b3374407c2c7e7db479f115 ChangeLog 7962
-MD5 811c07ba7510a315382249fc3adb44fc metadata.xml 175
-MD5 6073de272dd6cbfe30d272888ed458f1 sip-3.10.2.ebuild 985
-MD5 003bd57a5468d299d42bf9b3faa31ad8 sip-3.11.1.ebuild 989
-MD5 f1f7b930d08a04928ff97a1e31504bf3 sip-3.8-r1.ebuild 1108
-MD5 091ddb57f823459fd1d698ce48cb2802 sip-4.0.1.ebuild 1058
-MD5 dde7b0967395c23a8b56bad2d02fe923 sip-4.1.1.ebuild 1198
-MD5 482dbf379fc0b81f589fb2983fa72be0 sip-4.2.1.ebuild 1403
-MD5 051009e174698dfec8b9339803d05092 sip-4.2.ebuild 1392
-MD5 12bbcf91e753c326fa7725be85b3bdb2 sip-4.3.1.ebuild 1397
-MD5 e052f291e46bb8d1de4cfb1b45aeac88 files/digest-sip-3.10.2 62
-MD5 18e143f22df1dd8636fc12aa07ac9f36 files/digest-sip-3.11.1 62
-MD5 821af86e779d5bc5b3457336a0426fa1 files/digest-sip-3.8-r1 67
-MD5 6a011f04f4a2219a674a61dd82763301 files/digest-sip-4.0.1 61
-MD5 08ece4353d9fbbcda23f73d770999e49 files/digest-sip-4.1.1 61
-MD5 d83d1aa3500b9b65c79dbba9840a5d68 files/digest-sip-4.2 59
-MD5 1bd43eafb0d81d9f5b74ddc0a420cd93 files/digest-sip-4.2.1 61
-MD5 86e845ce5203479dce2e4ea0bb6e8ad9 files/digest-sip-4.3.1 61
-MD5 70ee7d5fd80e0bec5823095ca853d455 files/license-3.8.diff 1003
+MD5 4684defc77151f0e2483eedb9f1d4076 ChangeLog 1597
+MD5 0566b1536262d34d232c555ce994dcbc sip-3.5.ebuild 1146
+MD5 3c4a5f3f9efa66889bcf60d480634959 sip-3.6.ebuild 1152
+MD5 3d3910def0f161c87391dd758512fc18 files/license-3.6.diff 1037
+MD5 02beeecfef8cd92555d0a20b8d331fa6 files/digest-sip-3.5 67
+MD5 ea94cf729c92330a5d8a6d508361fd1c files/license-3.5.diff 1052
+MD5 6e388fdcff422e9e350096079b248249 files/digest-sip-3.6 67
diff --git a/dev-python/sip/metadata.xml b/dev-python/sip/metadata.xml
index a789e7bbe9ee..de483c53568f 100644
--- a/dev-python/sip/metadata.xml
+++ b/dev-python/sip/metadata.xml
@@ -2,5 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>python</herd>
-<herd>qt</herd>
 </pkgmetadata>
diff --git a/dev-python/sip/sip-3.10.2.ebuild b/dev-python/sip/sip-3.10.2.ebuild
index 84f776f93790..0c3c9989ec2d 100644
--- a/dev-python/sip/sip-3.10.2.ebuild
+++ b/dev-python/sip/sip-3.10.2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-3.10.2.ebuild,v 1.9 2005/02/08 05:06:31 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-3.10.2.ebuild,v 1.1 2004/05/22 19:54:14 carlo Exp $
+
+IUSE=""
 
 inherit distutils
 
@@ -10,10 +12,9 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha"
-IUSE=""
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 
-DEPEND="virtual/libc
+DEPEND="virtual/glibc
 	x11-libs/qt
 	virtual/python"
 
@@ -31,7 +32,3 @@ src_install() {
 	einstall DESTDIR=${D} || die
 	dodoc ChangeLog LICENSE NEWS README THANKS TODO
 }
-
-pkg_postinst() {
-	einfo "Please note, that you have to emerge PyQt again, when upgrading from an earlier sip-3.x version."
-}
diff --git a/dev-python/sip/sip-3.11.1.ebuild b/dev-python/sip/sip-3.11.1.ebuild
index 042b0d889ca5..d12db285ff70 100644
--- a/dev-python/sip/sip-3.11.1.ebuild
+++ b/dev-python/sip/sip-3.11.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-3.11.1.ebuild,v 1.2 2005/02/08 05:06:31 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-3.11.1.ebuild,v 1.1 2004/09/24 22:50:51 carlo Exp $
 
 inherit distutils
 
diff --git a/dev-python/sip/sip-3.8-r1.ebuild b/dev-python/sip/sip-3.8-r1.ebuild
index 427e985e1a53..ab49623dec25 100644
--- a/dev-python/sip/sip-3.8-r1.ebuild
+++ b/dev-python/sip/sip-3.8-r1.ebuild
@@ -1,20 +1,22 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-3.8-r1.ebuild,v 1.11 2005/02/08 05:06:31 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-3.8-r1.ebuild,v 1.1 2004/02/25 23:28:38 kloeri Exp $
+
+IUSE=""
 
 inherit eutils distutils
 
 MY_P="${PN}-x11-gpl-${PV}"
 DESCRIPTION="SIP is a tool for generating bindings for C++ classes so that they can be used by Python."
+#SRC_URI="http://www.river-bank.demon.co.uk/download/sip/${MY_P}.tar.gz"
 SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
 HOMEPAGE="http://www.riverbankcomputing.co.uk/sip/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha"
-IUSE=""
+KEYWORDS="x86 ~ppc ~sparc ~alpha"
 
-DEPEND="virtual/libc
+DEPEND="virtual/glibc
 	x11-libs/qt
 	>=dev-lang/python-2.2.1"
 
@@ -36,13 +38,11 @@ src_compile(){
 		-b ${D}/usr/bin \
 		-d ${D}/usr/lib/python${PYVER}/site-packages \
 		-e ${D}/usr/include/python${PYVER}
-
-	emake || die
 }
 
 src_install() {
 	distutils_python_version
-	dodir /usr/include/python${PYVER}
+	dodir /usr/include/python${PYVER}a
 	emake || die
 	einstall || die
 	dodoc NEWS README THANKS
diff --git a/dev-python/sip/sip-4.0.1.ebuild b/dev-python/sip/sip-4.0.1.ebuild
index c5bbdc9a37e2..e9ef16301f29 100644
--- a/dev-python/sip/sip-4.0.1.ebuild
+++ b/dev-python/sip/sip-4.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.0.1.ebuild,v 1.5 2005/02/08 05:06:31 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.0.1.ebuild,v 1.1 2004/07/06 14:51:25 carlo Exp $
 
 inherit distutils
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc sparc ~alpha amd64"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
 IUSE="doc"
 
 DEPEND="virtual/libc
diff --git a/dev-python/sip/sip-4.1.1.ebuild b/dev-python/sip/sip-4.1.1.ebuild
index 53f502ee0bbf..c1d6e056002d 100644
--- a/dev-python/sip/sip-4.1.1.ebuild
+++ b/dev-python/sip/sip-4.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.1.1.ebuild,v 1.10 2005/11/25 22:03:32 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.1.1.ebuild,v 1.1 2004/09/24 22:50:51 carlo Exp $
 
 inherit distutils
 
@@ -13,8 +13,8 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
-IUSE="debug doc"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+IUSE="doc"
 
 DEPEND="virtual/libc
 	x11-libs/qt
@@ -22,22 +22,20 @@ DEPEND="virtual/libc
 
 src_compile(){
 	distutils_python_version
-
-	local myconf="-l qt-mt -b /usr/bin -d /usr/$(get_libdir)/python${PYVER}/site-packages -e /usr/include/python${PYVER}"
-	use debug && myconf="${myconf} -u"
-
-	python configure.py ${myconf} "CFLAGS+=${CFLAGS}" "CXXFLAGS+=${CXXFLAGS}"
-	emake || die "emake failed"
+	python configure.py -l qt-mt \
+		-b /usr/bin \
+		-d /usr/lib/python${PYVER}/site-packages \
+		-e /usr/include/python${PYVER} \
+		"CXXFLAGS+=${CXXFLAGS}"
+	emake || die
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "install failed"
+	einstall DESTDIR=${D} || die
 	dodoc ChangeLog LICENSE NEWS README THANKS TODO
 	if use doc ; then dohtml doc/* ; fi
 }
 
 pkg_postinst() {
-	echo ""
 	einfo "Please note, that you have to emerge PyQt again, when upgrading from sip-3.x."
-	echo ""
 }
diff --git a/dev-python/sip/sip-4.2.1.ebuild b/dev-python/sip/sip-4.2.1.ebuild
index 55ac74a3a5cc..027175a9f820 100644
--- a/dev-python/sip/sip-4.2.1.ebuild
+++ b/dev-python/sip/sip-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.2.1.ebuild,v 1.2 2005/08/26 03:47:43 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.2.1.ebuild,v 1.1 2005/03/06 23:31:03 carlo Exp $
 
 inherit distutils
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ppc64"
 IUSE="debug doc"
 
 DEPEND="virtual/libc