summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /app-portage/porthole/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'app-portage/porthole/files')
-rw-r--r--app-portage/porthole/files/porthole-0.6.1-masking_status.patch17
-rw-r--r--app-portage/porthole/files/porthole-0.6.1-missing-attribute.patch14
-rw-r--r--app-portage/porthole/files/porthole-0.6.1-missing_import.patch19
3 files changed, 50 insertions, 0 deletions
diff --git a/app-portage/porthole/files/porthole-0.6.1-masking_status.patch b/app-portage/porthole/files/porthole-0.6.1-masking_status.patch
new file mode 100644
index 000000000000..e626fbb3c58f
--- /dev/null
+++ b/app-portage/porthole/files/porthole-0.6.1-masking_status.patch
@@ -0,0 +1,17 @@
+Index: porthole/backends/portagelib.py
+===================================================================
+--- porthole/backends/portagelib.py (revision 1209)
++++ porthole/backends/portagelib.py (working copy)
+@@ -452,7 +452,11 @@
+
+
+ def get_masking_status(ebuild):
+- return portage.getmaskingstatus(ebuild)
++ try:
++ status = portage.getmaskingstatus(ebuild)
++ except KeyError:
++ status = ['deprecated']
++ return status
+
+
+ def get_masking_reason(ebuild):
diff --git a/app-portage/porthole/files/porthole-0.6.1-missing-attribute.patch b/app-portage/porthole/files/porthole-0.6.1-missing-attribute.patch
new file mode 100644
index 000000000000..aa011a174b17
--- /dev/null
+++ b/app-portage/porthole/files/porthole-0.6.1-missing-attribute.patch
@@ -0,0 +1,14 @@
+diff -uNr porthole/db/user_configs.py.old porthole/db/user_configs.py
+
+--- porthole/db/user_configs.py.old 2010-11-27 13:34:35.000000000 +0600
++++ porthole/db/user_configs.py 2010-11-27 13:31:24.000000000 +0600
+@@ -364,7 +364,7 @@
+ debug.dprint("USER_CONFIGS: set_user_config(): add: " +
+ "%s,\n remove: %s " %(str(add),str(remove)))
+ set_config.set_user_config(filename=file, name=name, ebuild=ebuild,
+- comment=comment, username=privileges.USER,
++ comment=comment, username=privileges.user,
+ add=add, remove=remove)
+ self.set_config_callback()
+ else:
+ \ No newline at end of file
diff --git a/app-portage/porthole/files/porthole-0.6.1-missing_import.patch b/app-portage/porthole/files/porthole-0.6.1-missing_import.patch
new file mode 100644
index 000000000000..33c9e4ee3353
--- /dev/null
+++ b/app-portage/porthole/files/porthole-0.6.1-missing_import.patch
@@ -0,0 +1,19 @@
+--- porthole/db/user_configs.py 2010/03/20 12:32:29 1217
++++ porthole/db/user_configs.py 2010/03/20 14:10:46 1218
+@@ -36,6 +36,7 @@
+ from porthole import backends
+ portage_lib = backends.portage_lib
+ from porthole.utils import debug
++from porthole.privilege import controller as privileges
+
+ ## set up this module to act as a user configs data server,
+ ## watch the user configs for changes and auto update
+@@ -363,7 +364,7 @@
+ debug.dprint("USER_CONFIGS: set_user_config(): add: " +
+ "%s,\n remove: %s " %(str(add),str(remove)))
+ set_config.set_user_config(filename=file, name=name, ebuild=ebuild,
+- comment=comment, username=priviliges.USER,
++ comment=comment, username=privileges.USER,
+ add=add, remove=remove)
+ self.set_config_callback()
+ else: