summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Jones <carpaski@gentoo.org>2003-11-27 11:07:32 +0000
committerNicholas Jones <carpaski@gentoo.org>2003-11-27 11:07:32 +0000
commit60b670099b49f8523c35829b3e0ac5d9fbc13b87 (patch)
treeaf930273ecbe39a95fa278ec67ef0ceda3eea098 /sys-apps
parentdepend on dev-lang/nasm (bug 34451) (diff)
downloadhistorical-60b670099b49f8523c35829b3e0ac5d9fbc13b87.tar.gz
historical-60b670099b49f8523c35829b3e0ac5d9fbc13b87.tar.bz2
historical-60b670099b49f8523c35829b3e0ac5d9fbc13b87.zip
Add patch for missing import socket.
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/portage/Manifest3
-rw-r--r--sys-apps/portage/files/portage-2.0.49-r17-importsocket.diff12
-rw-r--r--sys-apps/portage/portage-2.0.49-r17.ebuild5
3 files changed, 17 insertions, 3 deletions
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index af13e252affd..d3474b18ca52 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,4 +1,4 @@
-MD5 2cfdc6ffef4887bfea25b17f7ca85271 portage-2.0.49-r17.ebuild 10521
+MD5 004ef37a381e320ab9cd9c09cf073e23 portage-2.0.49-r17.ebuild 10579
MD5 2264df67fab8f5ab427e536d7e32f497 ChangeLog 695
MD5 1ccc29af0e9489c8aec1090e62705bab portage-2.0.49-r15.ebuild 10281
MD5 b6989b04bc0ab44de75cf82ab47698fa files/portage-rescue-2.0.48-r1-sparc.tbz2 227629
@@ -10,3 +10,4 @@ MD5 73094a2d75dca36817b40611589ea226 files/portage-rescue-2.0.44-ppc.tbz2 168027
MD5 d4bb71bd3515647145916ba7d6287d20 files/README.RESCUE 1064
MD5 e2f7d2797f76d586452705abed1e515e files/portage-rescue-2.0.48-r1-sparc64.tbz2 227569
MD5 fa4bfa4ee3ec778658dadf6a63864877 files/portage-rescue-2.0.49-r15-amd64.tbz2 289608
+MD5 983f783499a94f12c0d6408096622cae files/portage-2.0.49-r17-importsocket.diff 557
diff --git a/sys-apps/portage/files/portage-2.0.49-r17-importsocket.diff b/sys-apps/portage/files/portage-2.0.49-r17-importsocket.diff
new file mode 100644
index 000000000000..b4899e8ff3cc
--- /dev/null
+++ b/sys-apps/portage/files/portage-2.0.49-r17-importsocket.diff
@@ -0,0 +1,12 @@
+diff -ur portage-2.0.49-r17/bin/emerge portage-2.0.49-r17.new/bin/emerge
+--- portage-2.0.49-r17/bin/emerge 2003-11-25 03:21:37.000000000 -0600
++++ portage-2.0.49-r17.new/bin/emerge 2003-11-27 04:52:08.000000000 -0600
+@@ -3,7 +3,7 @@
+ # Distributed under the terms of the GNU General Public License v2
+ # $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/files/portage-2.0.49-r17-importsocket.diff,v 1.1 2003/11/27 11:07:30 carpaski Exp $
+
+-import os,sys
++import os,sys,socket
+ os.environ["PORTAGE_CALLER"]="emerge"
+ sys.path += ["/usr/lib/portage/pym"]
+
diff --git a/sys-apps/portage/portage-2.0.49-r17.ebuild b/sys-apps/portage/portage-2.0.49-r17.ebuild
index 2e585b007c6c..b5206c846769 100644
--- a/sys-apps/portage/portage-2.0.49-r17.ebuild
+++ b/sys-apps/portage/portage-2.0.49-r17.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.49-r17.ebuild,v 1.1 2003/11/26 06:50:21 carpaski Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.49-r17.ebuild,v 1.2 2003/11/27 11:07:30 carpaski Exp $
IUSE="build"
@@ -33,7 +33,8 @@ python_version() {
src_unpack() {
unpack ${A}
- cd ${S}/pym
+ cd ${S}
+ patch -p1 < ${FILESDIR}/portage-2.0.49-r17-importsocket.diff
}
src_compile() {