# ChangeLog for app-portage/gentoolkit
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/ChangeLog,v 1.228 2011/07/28 02:55:53 fuzzyray Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/ChangeLog,v 1.229 2011/07/28 03:00:24 fuzzyray Exp $
+
+ 28 Jul 2011; Paul Varner <fuzzyray@gentoo.org>
+ -files/0.3.0_rc11-cpv.py.patch, -files/0.3.0_rc11-eshowkw_indir.patch,
+ -files/0.3.0_rc11-euse.patch, -files/0.3.0_rc11-euse_prefix.patch,
+ -files/0.3.0_rc11-setup.py.patch, -files/eclean.313901.patch:
+ Remove unused patches from files directory
*gentoolkit-0.3.0.4-r1 (28 Jul 2011)
AUX 0.3.0.4-euse.patch 857 RMD160 980e8614def7fb25c0957ff55d067c3c39c24d9d SHA1 0a7518fbac7c96aca5f44fa9f98b0932d6f2a6fe SHA256 1c8a97107417bb87e455425cd92b3cf62e09c268e959dfabaee9b6d4b082059b
-AUX 0.3.0_rc11-cpv.py.patch 695 RMD160 b914db3cced3dfe9820c909e6c086e1630ac8a1d SHA1 0db9298a48cdb165531b804bbaeaf2e023368d63 SHA256 32b5eebcfc7225059d381433d0da77cc840fa322d6390c91cb4e61a61db202a9
-AUX 0.3.0_rc11-eshowkw_indir.patch 870 RMD160 be3da0ced1645a930190aa5b563b05ebbd791a89 SHA1 a589a81a65e96c050f7f85b34b246cf1a9f463dc SHA256 fac5774bf3b17a7d88cf8fd57cea70980e9dcd49b2a622c960de59302fb2793a
-AUX 0.3.0_rc11-euse.patch 3396 RMD160 874caa282d3463d92e3e778eb966ed63b1b8c899 SHA1 5322f8d621f5a9a3499980241be90adbc6848368 SHA256 4993cb19e8aea2077ce55fb420e4a78d5f880293990c0baa8db5e059ae22841e
-AUX 0.3.0_rc11-euse_prefix.patch 432 RMD160 1066fbf7eb9e457b68c0ca5c88db76014ed7387d SHA1 507ab49332dc0b4b7e602827b73d8c7494869443 SHA256 626849524067ab3f87f3fc9d6b35425628b3a6a075b5ef1bb2eeb522ebbcc95d
-AUX 0.3.0_rc11-setup.py.patch 805 RMD160 0b0eecdd8eeb9667cb33e82c3f94853f96aa8fb0 SHA1 07179a1dcfe47db7849ddc3bb44d0adde57df09f SHA256 b05d56a5c52e53fe8150ce8e4181e7b9684eaf51145747357ed82218b90cfed2
-AUX eclean.313901.patch 1497 RMD160 21579445342977fe59a7a464605c963a43c59fa7 SHA1 daefcf1dde3c70b04d0bf528b88335656b48fe61 SHA256 2e825cb0ddfafcf139b9ae31c232e1f4b6f8401ca25070fe47c6ab3a4312f7be
DIST gentoolkit-0.2.4.6.1.tar.gz 90135 RMD160 7cfe8a8a6e697bbab0d93ec6d82f5b0aee8bcc03 SHA1 82e8a785a753a9e86063dd4fff2f4f864e4224bb SHA256 d057ce14e037e313ae085ac70871a56bbc147efe9beae8fcf8c818afcaa63896
DIST gentoolkit-0.3.0.4.tar.gz 180411 RMD160 f61d5532a90269a34c26d2c1731d5ba31359048f SHA1 eb373ba5069da8f2858f8afa4e40fe158501e94c SHA256 cc1fc031bf69a095a5cd2aab433f06e8eb3b5af2fef743bce5958c7f7f38803c
EBUILD gentoolkit-0.2.4.6.1-r1.ebuild 2068 RMD160 0d340f33a4b80ab28c851cdf380851a532283bba SHA1 a7d0c0d82414dc8c086059815393ebdc9aedb406 SHA256 2995cfcc97fa965c6dcab8eb9ebbdcaddf32c99e019545403a7f66b17d7685ad
EBUILD gentoolkit-0.3.0.4-r1.ebuild 2740 RMD160 39c25434d49da1d06798aa7555564cda8d3bf96a SHA1 ccb51d3444774669c93d7df92afe037232ab5c84 SHA256 066a4446aed621cd7739beaf875fef81d272fea04dd4274361170afc9d730ff1
EBUILD gentoolkit-0.3.0.4.ebuild 2667 RMD160 821a8de610472379b7495ec535a9806dc10a0481 SHA1 a19140ff5aca6f86a582b5be9aeef6fe55661830 SHA256 277430a4a0c299c9c0aca4c347038414b96c3dd60a987fc66b268a4145716ae1
EBUILD gentoolkit-9999.ebuild 2138 RMD160 52e0a1a8ce72b73a7a23ba9f88dd10ed74e8fd4f SHA1 770efb12989efbc440e247272d19a04107f0867c SHA256 7352e4625b86a4f894776016e358eeace57f603e3b6b64b50cbb80d864bc390b
-MISC ChangeLog 64051 RMD160 33eec52ad97821eb6f0fc9497e6e40424c81032e SHA1 941efe45b24129c444e732437236822c39c3b5ab SHA256 883eae01ca1fe2e5b378c68c6a6adf7def6904ea417212727a5c39b01fd28cd1
+MISC ChangeLog 64352 RMD160 7e404b426c0e67d25a55b44945554474e1cff324 SHA1 22d156b9a05afe0b98f1d610304074020dc69608 SHA256 b5700f42f2a0917e290b6a25352536458dd80f02f604d2bf830e4f6091fc84a7
MISC metadata.xml 451 RMD160 b1cce9123da273149c731793696937f9b3d02c60 SHA1 6126c34edcb6ed5f4274e060881378cc1cf10757 SHA256 1a2def4d28f69d6bffeb0b09e97ce53e6822e457d5d9308000a1010dca32abeb
+++ /dev/null
-Index: pym/gentoolkit/cpv.py
-===================================================================
---- pym/gentoolkit/cpv.py (revision 864)
-+++ pym/gentoolkit/cpv.py (working copy)
-@@ -34,6 +34,8 @@
- "(?:_(p(?:re)?|beta|alpha|rc)\\d*)*$")
- isvalid_cat_re = re.compile("^(?:[a-zA-Z0-9][-a-zA-Z0-9+._]*(?:/(?!$))?)+$")
- _pkg_re = re.compile("^[a-zA-Z0-9+_]+$")
-+# Prefix specific revision is of the form -r0<digit>+.<digit>+
-+isvalid_rev_re = re.compile(r'(\d+|0\d+\.\d+)')
-
- # =======
- # Classes
-@@ -249,6 +251,6 @@
-
-
- def isvalid_rev(s):
-- return s and s[0] == 'r' and s[1:] != '0' and s[1:].isdigit()
-+ return s and s[0] == 'r' and isvalid_rev_re.match(s[1:])
-
- # vim: set ts=4 sw=4 tw=79:
+++ /dev/null
-Index: gentoolkit/pym/gentoolkit/eshowkw/__init__.py
-===================================================================
---- gentoolkit/pym/gentoolkit/eshowkw/__init__.py (revision 856)
-+++ gentoolkit/pym/gentoolkit/eshowkw/__init__.py (revision 857)
-@@ -118,9 +118,9 @@
- if len(ebuilds) <= 0:
- msg_err = 'No ebuilds at "%s"' % currdir
- raise SystemExit(msg_err)
-- package= '/'.join(os.path.basename(os.path.abspath('../')), os.path.basename(currdir))
-+ package= '%s/%s' % (os.path.basename(os.path.abspath('../')), os.path.basename(currdir))
- ourtree = os.path.abspath('../../')
-- overlays = ' '.join(ports['PORTDIR_OVERLAY'], ourtree)
-+ overlays = '%s %s' % (ports['PORTDIR_OVERLAY'], ourtree)
- mysettings = portc(env={'PORTDIR_OVERLAY': overlays})
- dbapi = portdbapi(mysettings=mysettings)
- # specify that we want just our nice tree we are in cwd
+++ /dev/null
-Index: bin/euse
-===================================================================
---- bin/euse (revision 867)
-+++ bin/euse (working copy)
-@@ -9,11 +9,42 @@
- PROGRAM_NAME=euse
- VERSION="svn"
-
--MAKE_CONF_PATH=/etc/make.conf
--MAKE_GLOBALS_PATH=/etc/make.globals
--MAKE_PROFILE_PATH=/etc/make.profile
--MAKE_CONF_BACKUP_PATH=/etc/make.conf.euse_backup
-+ETC="/etc"
-+USR_SHARE_PORTAGE="/usr/share/portage"
-
-+# define error function so it can be used immediately
-+error() {
-+ echo "ERROR: ${1}"
-+ set +f
-+ exit 1
-+}
-+
-+# /etc/make.conf can now exist in /etc/portage/make.conf, prefer it over /etc/make.conf for changes
-+if [ -e "${ETC}/portage/make.conf" ]; then
-+ MAKE_CONF_PATH="${ETC}/portage/make.conf"
-+elif [ -e "${ETC}/make.conf" ]; then
-+ MAKE_CONF_PATH="${ETC}/make.conf"
-+else
-+ error "make.conf does not exist"
-+fi
-+MAKE_CONF_BACKUP_PATH="${MAKE_CONF_PATH}.euse_backup"
-+
-+# /etc/make.globals has been moved to /usr/share/portage/config/make.globals
-+if [ -e "${USR_SHARE_PORTAGE}/config/make.globals" ]; then
-+ MAKE_GLOBALS_PATH="${USR_SHARE_PORTAGE}/config/make.globals"
-+else
-+ MAKE_GLOBALS_PATH="${ETC}/make.globals"
-+fi
-+
-+# /etc/make.profile or /etc/portage/make.profile, if /etc/make.profile exists, it will be used
-+if [ -e "${ETC}/make.profile" ]; then
-+ MAKE_PROFILE_PATH="${ETC}/make.profile"
-+elif [ -e "${ETC}/portage/make.profile" ]; then
-+ MAKE_PROFILE_PATH="${ETC}/portage/make.profile"
-+else
-+ error "make.profile does not exist"
-+fi
-+
- [ -z "${MODE}" ] && MODE="showhelp" # available operation modes: showhelp, showversion, showdesc, showflags, modify
-
- parse_arguments() {
-@@ -49,12 +80,6 @@
- done
- }
-
--error() {
-- echo "ERROR: ${1}"
-- set +f
-- exit 1
--}
--
- get_real_path() {
- set -P
- cd "$1"
-@@ -67,12 +92,16 @@
- # file permission tests
- local descdir
- local make_defaults
-+ local make_conf
-
- [[ ! -d "${MAKE_PROFILE_PATH}" || ! -r "${MAKE_PROFILE_PATH}" ]] && error "${MAKE_PROFILE_PATH} is not readable"
-+ #
-+ for make_conf in $(get_all_make_conf); do
-+ [ ! -r "${make_conf}" ] && error "${make_conf} is not readable"
-+ done
-
- descdir="$(get_portdir)/profiles"
-
-- [ ! -r "${MAKE_CONF_PATH}" ] && error "${MAKE_CONF_PATH} is not readable"
- [ ! -r "${MAKE_GLOBALS_PATH}" ] && error "${MAKE_GLOBALS_PATH} is not readable"
- [ -z "$(get_portdir)" ] && error "\$PORTDIR couldn't be determined"
- [ ! -d "${descdir}" ] && error "${descdir} does not exist or is not a directory"
-@@ -160,8 +189,10 @@
-
- ACTIVE_FLAGS[0]="$(reduce_incrementals ${USE})"
- USE=""
-- source "${MAKE_CONF_PATH}"
-- ACTIVE_FLAGS[1]="$(reduce_incrementals ${USE})"
-+ for x in $(get_all_make_conf); do
-+ source "${x}"
-+ ACTIVE_FLAGS[1]="$(reduce_incrementals ${ACTIVE_FLAGS[1]} ${USE})"
-+ done
- USE=""
- for x in $(get_all_make_defaults); do
- source "${x}"
-@@ -196,6 +227,13 @@
- fi
- }
-
-+# get all make.conf files that exist on the system
-+get_all_make_conf() {
-+ # At least one of the files exists or we would not have made it this far
-+ for x in ${ETC}/make.conf ${ETC}/portage/make.conf; do
-+ [ -e "${x}" ] && echo "${x}"
-+ done
-+}
- # get all make.defaults by traversing the cascaded profile directories
- get_all_make_defaults() {
- local curdir
-@@ -272,7 +310,9 @@
- for x in $(get_all_make_defaults); do
- source "${x}"
- done
-- source "${MAKE_CONF_PATH}"
-+ for x in $(get_all_make_conf); do
-+ source "${x}"
-+ done
- USE="${use_backup}"
- fi
- echo "${PORTDIR}"
+++ /dev/null
-Index: bin/euse
-===================================================================
---- bin/euse (revision 868)
-+++ bin/euse (working copy)
-@@ -9,8 +9,9 @@
- PROGRAM_NAME=euse
- VERSION="svn"
-
--ETC="/etc"
--USR_SHARE_PORTAGE="/usr/share/portage"
-+EPREFIX=${EPREFIX:-$(portageq envvar EPREFIX)}
-+ETC="${EPREFIX}/etc"
-+USR_SHARE_PORTAGE="${EPREFIX}/usr/share/portage"
-
- # define error function so it can be used immediately
- error() {
+++ /dev/null
-Index: setup.py
-===================================================================
---- setup.py (revision 857)
-+++ setup.py (working copy)
-@@ -10,6 +10,7 @@
- from glob import glob
-
- import os
-+import io
-
- sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'pym'))
-
-@@ -59,13 +60,13 @@
- def sub(files, pattern):
- for f in files:
- updated_file = []
-- with open(f) as s:
-+ with io.open(f, 'r', 1, 'utf_8') as s:
- for line in s:
- newline = re.sub(pattern, '"%s"' % ver, line, 1)
- if newline != line:
- log.info("%s: %s" % (f, newline))
- updated_file.append(newline)
-- with open(f, 'w') as s:
-+ with io.open(f, 'w', 1, 'utf_8') as s:
- s.writelines(updated_file)
- quote = r'[\'"]{1}'
- bash_re = r'(?<=VERSION=)' + quote + '[^\'"]*' + quote
+++ /dev/null
-Index: pym/gentoolkit/eclean/exclude.py
-===================================================================
---- pym/gentoolkit/eclean/exclude.py (revision 766)
-+++ pym/gentoolkit/eclean/exclude.py (working copy)
-@@ -223,6 +223,7 @@
- pkgname = cp.split('/')[1]
- p.add(pkgname)
- if 'packages' in exclude:
-+ for cp in exclude['packages']:
- pkgname = cp.split('/')[1]
- p.add(pkgname)
- if 'anti-packages' in exclude:
-Index: pym/gentoolkit/eclean/cli.py
-===================================================================
---- pym/gentoolkit/eclean/cli.py (revision 766)
-+++ pym/gentoolkit/eclean/cli.py (working copy)
-@@ -463,6 +463,11 @@
- if options['verbose']:
- options['verbose-output'] = output.einfo
- # parse the exclusion file
-+ if not 'exclude-file' in options:
-+ # set it to the default exclude file if it exists
-+ exclude_file = "/etc/%s/%s.exclude" % (__productname__ , action)
-+ if os.path.isfile(exclude_file):
-+ options['exclude-file'] = exclude_file
- if 'exclude-file' in options:
- try:
- exclude = parseExcludeFile(options['exclude-file'],
-@@ -475,10 +480,7 @@
- "See format of this file in `man %s`" % __productname__), file=sys.stderr)
- sys.exit(1)
- else:
-- exclude_file = "/etc/%s/%s.exclude" % (__productname__ , action)
-- if os.path.isfile(exclude_file):
-- options['exclude-file'] = exclude_file
-- exclude={}
-+ exclude = {}
- # security check for non-pretend mode
- if not options['pretend'] and portage.secpass == 0:
- print( pp.error(
projects / gentoo.git / commitdiff