* [gentoo-commits] proj/python-updater:master commit in: /
@ 2013-03-24 15:17 Mike Gilbert
0 siblings, 0 replies; 13+ messages in thread
From: Mike Gilbert @ 2013-03-24 15:17 UTC (permalink / raw
To: gentoo-commits
commit: 1ef83a03bb3ec55b30b04e07723dca95aaf767e3
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 22 23:58:07 2013 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Feb 22 23:58:07 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/python-updater.git;a=commit;h=1ef83a03
Skip any packages which have "python_targets_" in IUSE
We don't need to check such packages ourselves; emerge --newuse should
cover it.
---
python-updater | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/python-updater b/python-updater
index fc3294f..4fd4faa 100755
--- a/python-updater
+++ b/python-updater
@@ -701,6 +701,10 @@ for contents_file in $(find ${PKG_DBDIR}/ -name CONTENTS | sort); do
CATPKGVER="=${CATEGORY}/${PF}"
fi
+ IUSE=
+ iuse_file=${contents_file%CONTENTS}IUSE
+ [[ -f ${iuse_file} ]] && IUSE=$(<"${iuse_file}")
+
veinfo 2 "Checking ${CATEGORY}/${PF}${SLOT:+:}${SLOT}"
# Exclude packages, which are exceptions, like Portage and Python itself.
@@ -719,6 +723,13 @@ for contents_file in $(find ${PKG_DBDIR}/ -name CONTENTS | sort); do
continue
fi
+ if [[ ${IUSE} =~ python_targets_ ]]; then
+ eindent
+ veinfo 2 "Skipping ${CATPKGVER}, reason: python_targets_ in IUSE"
+ eoutdent
+ continue
+ fi
+
if [[ -n "${PYTHON_MULTIPLE_ABIS}" && "${EAPI}" =~ ^4-python$ ]]; then
# Potentially update USE flags in IUSE in EAPI >= 4-python.
if [[ "${PRETEND}" -eq 0 && -f "${contents_file%CONTENTS}IUSE" && -f "${contents_file%CONTENTS}USE" && -f "${contents_file%CONTENTS}repository" ]]; then
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] proj/python-updater:master commit in: /
@ 2013-03-24 15:28 Mike Gilbert
0 siblings, 0 replies; 13+ messages in thread
From: Mike Gilbert @ 2013-03-24 15:28 UTC (permalink / raw
To: gentoo-commits
commit: 97402bcfe5daf6fd9c63c33e1c017dcef10836ba
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 24 15:27:57 2013 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Mar 24 15:27:57 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/python-updater.git;a=commit;h=97402bcf
Increment version.
---
python-updater | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/python-updater b/python-updater
index 4fd4faa..6597ce2 100755
--- a/python-updater
+++ b/python-updater
@@ -25,7 +25,7 @@ if [[ "${BASH_VERSINFO[0]}" -lt 4 ]]; then
exit 1
fi
-VERSION="0.10"
+VERSION="0.11"
OLD_PYTHON_VERSIONS=""
OLD_PYTHON2_VERSIONS=""
OLD_PYTHON3_VERSIONS=""
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] proj/python-updater:master commit in: /
@ 2013-03-24 15:30 Mike Gilbert
0 siblings, 0 replies; 13+ messages in thread
From: Mike Gilbert @ 2013-03-24 15:30 UTC (permalink / raw
To: gentoo-commits
commit: 4516ceb50809fe99526b52e139261960b387c850
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 24 15:30:16 2013 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Mar 24 15:30:16 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/python-updater.git;a=commit;h=4516ceb5
Makefile updates.
---
Makefile | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index cb9e2f2..30d33b8 100644
--- a/Makefile
+++ b/Makefile
@@ -15,8 +15,8 @@ python-updater.1: python-updater $(MAN_INCLUDE)
.PHONY: all clean tarball upload
clean:
rm -fr python-updater.1 *.bz2 $(PKGDIR) || true
-tarball:
- mkdir $(PKGDIR)
+tarball: $(FILES)
+ mkdir -p $(PKGDIR)
cp $(FILES) $(PKGDIR)
tar -cjf $(TARBALL) $(PKGDIR)
rm -fr $(PKGDIR)
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] proj/python-updater:master commit in: /
@ 2014-03-12 21:59 Mike Gilbert
0 siblings, 0 replies; 13+ messages in thread
From: Mike Gilbert @ 2014-03-12 21:59 UTC (permalink / raw
To: gentoo-commits
commit: 11625489469dd9675565e6eb7d0546f31c083c57
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 12 21:42:01 2014 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Mar 12 21:58:33 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/python-updater.git;a=commit;h=11625489
Add a check for dev-python/python-exec rev-deps.
---
man.include | 5 +++++
python-updater | 23 +++++++++++++++++++++++
2 files changed, 28 insertions(+)
diff --git a/man.include b/man.include
index d07ffa3..4ae051e 100644
--- a/man.include
+++ b/man.include
@@ -28,6 +28,11 @@ need_rebuild
python_need_rebuild function from python.eclass.
Enabled by default.
+python-exec
+ This check looks for packages that depend on dev-python/python-exec
+ rather than new dev-lang/python-exec.
+ Enabled by default.
+
Checks can be enabled/disabled on command line with -e/--enable and -d/--disable
switches.
diff --git a/python-updater b/python-updater
index 6597ce2..2d44706 100755
--- a/python-updater
+++ b/python-updater
@@ -101,6 +101,7 @@ done)
* manual (Enabled by default)
* need_rebuild (Enabled by default)
* pylibdir (Enabled by default)
+ * python-exec (Enabled by default)
* PYTHON_ABIS (Enabled by default)
* shared_linking (Enabled by default)
* static_linking (Enabled by default)
@@ -427,6 +428,7 @@ while (($#)); do
CHECK_NEED_REBUILD="1"
CHECK_PYLIBDIR="1"
CHECK_PYTHON_ABIS="1"
+ CHECK_PYTHON_EXEC="1"
CHECK_SHARED_LINKING="1"
CHECK_STATIC_LINKING="1"
;;
@@ -435,6 +437,7 @@ while (($#)); do
CHECK_NEED_REBUILD="0"
CHECK_PYLIBDIR="0"
CHECK_PYTHON_ABIS="0"
+ CHECK_PYTHON_EXEC="0"
CHECK_SHARED_LINKING="0"
CHECK_STATIC_LINKING="0"
;;
@@ -462,6 +465,12 @@ while (($#)); do
-dPYTHON_ABIS|--disable-PYTHON_ABIS)
CHECK_PYTHON_ABIS="0"
;;
+ -epython-exec|--enable-python-exec)
+ CHECK_PYTHON_EXEC="1"
+ ;;
+ -dpython-exec|--disable-python-exec)
+ CHECK_PYTHON_EXEC="0"
+ ;;
-eshared_linking|--enable-shared_linking)
CHECK_SHARED_LINKING="1"
;;
@@ -723,6 +732,20 @@ for contents_file in $(find ${PKG_DBDIR}/ -name CONTENTS | sort); do
continue
fi
+ if [[ "${CHECK_PYTHON_EXEC}" -ne 0 ]]; then
+ RDEPEND="$(<"${contents_file%CONTENTS}RDEPEND")"
+
+ if [[ ${RDEPEND} == *dev-python/python-exec* ]]; then
+ PKGS_TO_REMERGE+=" ${CATPKGVER}"
+ eindent
+ einfo "Adding to list: ${CATPKGVER}"
+ eindent
+ veinfo 1 "check: python-exec [ Package depending on dev-python/python-exec ]"
+ eoutdent && eoutdent
+ fi
+ continue
+ fi
+
if [[ ${IUSE} =~ python_targets_ ]]; then
eindent
veinfo 2 "Skipping ${CATPKGVER}, reason: python_targets_ in IUSE"
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] proj/python-updater:master commit in: /
@ 2014-03-16 18:09 Mike Gilbert
0 siblings, 0 replies; 13+ messages in thread
From: Mike Gilbert @ 2014-03-16 18:09 UTC (permalink / raw
To: gentoo-commits
commit: 2979e0ff26da955476d0846aede7acc4d81c82b9
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 16 17:47:50 2014 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Mar 16 18:00:02 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/python-updater.git;a=commit;h=2979e0ff
Source /lib/gentoo/functions.sh, bug 504130.
---
python-updater.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/python-updater.in b/python-updater.in
index 68c6ead..7fc535d 100644
--- a/python-updater.in
+++ b/python-updater.in
@@ -61,8 +61,8 @@ CHECK_PYTHON_ABIS="1"
CHECK_SHARED_LINKING="1"
CHECK_STATIC_LINKING="1"
-# Load the Gentoo-style info macros, but hack to get around it thinking this is an rc script.
-EBUILD="1" . "@GENTOO_PORTAGE_EPREFIX@"/etc/init.d/functions.sh
+# Load the Gentoo-style info macros
+. "@GENTOO_PORTAGE_EPREFIX@"/lib/gentoo/functions.sh
# Portage variables.
PKG_DBDIR="@GENTOO_PORTAGE_EPREFIX@/var/db/pkg"
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] proj/python-updater:master commit in: /
@ 2014-03-16 18:09 Mike Gilbert
0 siblings, 0 replies; 13+ messages in thread
From: Mike Gilbert @ 2014-03-16 18:09 UTC (permalink / raw
To: gentoo-commits
commit: dc0ca6a3c7448a4d1c30292ee0099fd3974121b3
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 16 17:48:26 2014 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Mar 16 18:00:02 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/python-updater.git;a=commit;h=dc0ca6a3
Bump to version 0.12.
---
python-updater.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/python-updater.in b/python-updater.in
index 7fc535d..f079316 100644
--- a/python-updater.in
+++ b/python-updater.in
@@ -25,7 +25,7 @@ if [[ "${BASH_VERSINFO[0]}" -lt 4 ]]; then
exit 1
fi
-VERSION="0.11"
+VERSION="0.12"
OLD_PYTHON_VERSIONS=""
OLD_PYTHON2_VERSIONS=""
OLD_PYTHON3_VERSIONS=""
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] proj/python-updater:master commit in: /
@ 2014-03-16 18:09 Mike Gilbert
0 siblings, 0 replies; 13+ messages in thread
From: Mike Gilbert @ 2014-03-16 18:09 UTC (permalink / raw
To: gentoo-commits
commit: 54f022c6c81281774400fb495b160caadd10bbb7
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 16 17:12:01 2014 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Mar 16 17:12:01 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/python-updater.git;a=commit;h=54f022c6
Incorporate prefix support.
---
python-updater | 77 +++++++++++++++++++++++++++++++++++-----------------------
1 file changed, 47 insertions(+), 30 deletions(-)
diff --git a/python-updater b/python-updater
index 2d44706..68c6ead 100755
--- a/python-updater
+++ b/python-updater
@@ -29,7 +29,7 @@ VERSION="0.11"
OLD_PYTHON_VERSIONS=""
OLD_PYTHON2_VERSIONS=""
OLD_PYTHON3_VERSIONS=""
-NEW_PYTHON_VERSION="$(/usr/bin/python -c 'from sys import version_info; print(".".join([str(x) for x in version_info[:2]]))')"
+NEW_PYTHON_VERSION="$("@GENTOO_PORTAGE_EPREFIX@"/usr/bin/python -c 'from sys import version_info; print(".".join([str(x) for x in version_info[:2]]))')"
NEW_PYTHON2_VERSION=""
NEW_PYTHON3_VERSION=""
@@ -62,10 +62,10 @@ CHECK_SHARED_LINKING="1"
CHECK_STATIC_LINKING="1"
# Load the Gentoo-style info macros, but hack to get around it thinking this is an rc script.
-EBUILD="1" . /etc/init.d/functions.sh
+EBUILD="1" . "@GENTOO_PORTAGE_EPREFIX@"/etc/init.d/functions.sh
# Portage variables.
-PKG_DBDIR="/var/db/pkg"
+PKG_DBDIR="@GENTOO_PORTAGE_EPREFIX@/var/db/pkg"
shopt -s expand_aliases
@@ -146,7 +146,7 @@ has() {
# has_version(cpv)
has_version() {
if [[ "${PMS_COMMAND[${PMS_INDEX}]}" == "emerge" ]]; then
- /usr/bin/portageq has_version / "${1}"
+ "@GENTOO_PORTAGE_EPREFIX@"/usr/bin/portageq has_version "@GENTOO_PORTAGE_EPREFIX@"/ "${1}"
elif [[ "${PMS_COMMAND[${PMS_INDEX}]}" == "pmerge" ]]; then
pquery --vdb "${1}"
else
@@ -157,7 +157,7 @@ has_version() {
# get_ebuild_path(CATEGORY, PN, SLOT)
get_ebuild_path() {
# These manual calls to Portage API are 2 times faster than 'portageq get_repo_path / "$(portageq metadata / ebuild "$(portageq best_visible / "${1}")" repository)"'.
- /usr/bin/python -c "
+ "@GENTOO_PORTAGE_EPREFIX@"/usr/bin/python -c "
import sys
if '' in sys.path:
@@ -165,7 +165,7 @@ if '' in sys.path:
import portage
-dbapi = portage.db['/']['porttree'].dbapi
+dbapi = portage.db['@GENTOO_PORTAGE_EPREFIX@/']['porttree'].dbapi
pkg_list = dbapi.match('${1}/${2}${3:+:}${3}')
if pkg_list:
best_visible = portage.best(pkg_list)
@@ -241,7 +241,7 @@ unset_unless_changed() {
local variable
for variable in "$@"; do
- if eval "[[ \${${variable}} == \$(env -u ${variable} /usr/bin/portageq envvar ${variable}) ]]"; then
+ if eval "[[ \${${variable}} == \$(env -u ${variable} "@GENTOO_PORTAGE_EPREFIX@"/usr/bin/portageq envvar ${variable}) ]]"; then
unset ${variable}
fi
done
@@ -253,14 +253,14 @@ global_USE_PYTHON=""
get_USE_PYTHON() {
if [[ "${PMS_COMMAND[${PMS_INDEX}]}" =~ ^(emerge|pmerge)$ ]]; then
if [[ -z "${global_USE_PYTHON}" ]]; then
- global_USE_PYTHON="$(/usr/bin/portageq envvar USE_PYTHON)"
+ global_USE_PYTHON="$("@GENTOO_PORTAGE_EPREFIX@"/usr/bin/portageq envvar USE_PYTHON)"
fi
USE_PYTHON="${global_USE_PYTHON}"
- if [[ -f "/etc/portage/env/${1}/${2}" ]]; then
- USE_PYTHON="$(. "/etc/portage/env/${1}/${2}"; echo "${USE_PYTHON}")"
+ if [[ -f "@GENTOO_PORTAGE_EPREFIX@/etc/portage/env/${1}/${2}" ]]; then
+ USE_PYTHON="$(. "@GENTOO_PORTAGE_EPREFIX@/etc/portage/env/${1}/${2}"; echo "${USE_PYTHON}")"
fi
- if [[ -f "/etc/portage/env/${1}/${2}:${3}" ]]; then
- USE_PYTHON="$(. "/etc/portage/env/${1}/${2}:${3}"; echo "${USE_PYTHON}")"
+ if [[ -f "@GENTOO_PORTAGE_EPREFIX@/etc/portage/env/${1}/${2}:${3}" ]]; then
+ USE_PYTHON="$(. "@GENTOO_PORTAGE_EPREFIX@/etc/portage/env/${1}/${2}:${3}"; echo "${USE_PYTHON}")"
fi
else
USE_PYTHON="$(cave print-id-environment-variable "${1}/${2}${3:+:}${3}::/?" --best --format %v --variable-name USE_PYTHON)"
@@ -498,23 +498,23 @@ while (($#)); do
done
if [[ "${PMS_COMMAND[${PMS_INDEX}]}" == "emerge" ]]; then
- sed="$(/usr/bin/python -c "import os; print(os.path.dirname(os.path.realpath('$(type -p emerge)')))")/ebuild-helpers/sed"
+ sed="$("@GENTOO_PORTAGE_EPREFIX@"/usr/bin/python -c "import os; print(os.path.dirname(os.path.realpath('$(type -p emerge)')))")/ebuild-helpers/sed"
if [[ -x "${sed}" ]]; then
alias sed="${sed}"
fi
fi
if has_version "=dev-lang/python-2*"; then
- if [[ "$(readlink /usr/bin/python2)" != "python2."* ]]; then
- die "'/usr/bin/python2' is not valid symlink"
+ if [[ "$(readlink "@GENTOO_PORTAGE_EPREFIX@"/usr/bin/python2)" != "python2."* ]]; then
+ die "'@GENTOO_PORTAGE_EPREFIX@/usr/bin/python2' is not valid symlink"
fi
- NEW_PYTHON2_VERSION="$(/usr/bin/python2 -c 'from sys import version_info; print(".".join([str(x) for x in version_info[:2]]))')"
+ NEW_PYTHON2_VERSION="$("@GENTOO_PORTAGE_EPREFIX@"/usr/bin/python2 -c 'from sys import version_info; print(".".join([str(x) for x in version_info[:2]]))')"
fi
if has_version "=dev-lang/python-3*"; then
- if [[ "$(readlink /usr/bin/python3)" != "python3."* ]]; then
- die "'/usr/bin/python3' is not valid symlink"
+ if [[ "$(readlink "@GENTOO_PORTAGE_EPREFIX@"/usr/bin/python3)" != "python3."* ]]; then
+ die "'@GENTOO_PORTAGE_EPREFIX@/usr/bin/python3' is not valid symlink"
fi
- NEW_PYTHON3_VERSION="$(/usr/bin/python3 -c 'from sys import version_info; print(".".join([str(x) for x in version_info[:2]]))')"
+ NEW_PYTHON3_VERSION="$("@GENTOO_PORTAGE_EPREFIX@"/usr/bin/python3 -c 'from sys import version_info; print(".".join([str(x) for x in version_info[:2]]))')"
fi
if [[ -z "${NEW_PYTHON2_VERSION}" && -z "${NEW_PYTHON3_VERSION}" ]]; then
die "Python 2 and Python 3 not installed"
@@ -524,10 +524,15 @@ OLD_PYTHON_SHARED_LIBRARIES_REGEX=""
for python_version in ${PYTHON_VERSIONS}; do
if [[ "${python_version}" != "${NEW_PYTHON_VERSION}" ]]; then
OLD_PYTHON_VERSIONS+="${OLD_PYTHON_VERSIONS:+ }${python_version}"
- soname="$(readlink -n /usr/lib/libpython${python_version}.so)"
+ soname="$(readlink -n "@GENTOO_PORTAGE_EPREFIX@"/usr/lib/libpython${python_version}.so)"
if [[ -z "${soname}" ]]; then
# Use relatively safe, default value.
- soname="libpython${python_version}.so.1.0"
+ if [[ -f "@GENTOO_PORTAGE_EPREFIX@"/usr/lib/libpython${python_version}.dylib ]] ; then
+ # there is no versioned dylib on Darwin
+ soname="libpython${python_version}.dylib"
+ else
+ soname="libpython${python_version}.so.1.0"
+ fi
fi
OLD_PYTHON_SHARED_LIBRARIES_REGEX+="${OLD_PYTHON_SHARED_LIBRARIES_REGEX:+|}${soname//./\.}"
fi
@@ -540,10 +545,15 @@ OLD_PYTHON2_SHARED_LIBRARIES_REGEX=""
for python_version in ${PYTHON2_VERSIONS}; do
if [[ "${python_version}" != "${NEW_PYTHON2_VERSION}" ]]; then
OLD_PYTHON2_VERSIONS+="${OLD_PYTHON2_VERSIONS:+ }${python_version}"
- soname="$(readlink -n /usr/lib/libpython${python_version}.so)"
+ soname="$(readlink -n "@GENTOO_PORTAGE_EPREFIX@"/usr/lib/libpython${python_version}.so)"
if [[ -z "${soname}" ]]; then
# Use relatively safe, default value.
- soname="libpython${python_version}.so.1.0"
+ if [[ -f "@GENTOO_PORTAGE_EPREFIX@"/usr/lib/libpython${python_version}.dylib ]] ; then
+ # there is no versioned dylib on Darwin
+ soname="libpython${python_version}.dylib"
+ else
+ soname="libpython${python_version}.so.1.0"
+ fi
fi
OLD_PYTHON2_SHARED_LIBRARIES_REGEX+="${OLD_PYTHON2_SHARED_LIBRARIES_REGEX:+|}${soname//./\.}"
fi
@@ -556,10 +566,15 @@ OLD_PYTHON3_SHARED_LIBRARIES_REGEX=""
for python_version in ${PYTHON3_VERSIONS}; do
if [[ "${python_version}" != "${NEW_PYTHON3_VERSION}" ]]; then
OLD_PYTHON3_VERSIONS+="${OLD_PYTHON3_VERSIONS:+ }${python_version}"
- soname="$(readlink -n /usr/lib/libpython${python_version}.so)"
+ soname="$(readlink -n "@GENTOO_PORTAGE_EPREFIX@"/usr/lib/libpython${python_version}.so)"
if [[ -z "${soname}" ]]; then
# Use relatively safe, default value.
- soname="libpython${python_version}.so.1.0"
+ if [[ -f "@GENTOO_PORTAGE_EPREFIX@"/usr/lib/libpython${python_version}.dylib ]] ; then
+ # there is no versioned dylib on Darwin
+ soname="libpython${python_version}.dylib"
+ else
+ soname="libpython${python_version}.so.1.0"
+ fi
fi
OLD_PYTHON3_SHARED_LIBRARIES_REGEX+="${OLD_PYTHON3_SHARED_LIBRARIES_REGEX:+|}${soname//./\.}"
fi
@@ -570,7 +585,7 @@ OLD_PYTHON3_SHARED_LIBRARIES_REGEX="(${OLD_PYTHON3_SHARED_LIBRARIES_REGEX})"
declare -A PYTHON_GLOBALLY_SUPPORTED_ABIS
if [[ "${PMS_COMMAND[${PMS_INDEX}]}" == "emerge" ]]; then
- eval "$(/usr/bin/python -c \
+ eval "$("@GENTOO_PORTAGE_EPREFIX@"/usr/bin/python -c \
"import re
import sys
@@ -589,7 +604,7 @@ variables = [
for variable in variables:
exec('%(variable)s_regex = re.compile(r\'^%(variable)s=\((.*)\)\')' % {'variable': variable})
-dbapi = portage.db['/']['porttree'].dbapi
+dbapi = portage.db['@GENTOO_PORTAGE_EPREFIX@/']['porttree'].dbapi
python_eclass_locations = {}
if hasattr(dbapi.repositories.mainRepo(), 'eclass_db'):
@@ -849,7 +864,7 @@ for contents_file in $(find ${PKG_DBDIR}/ -name CONTENTS | sort); do
fi
if [[ "${CHECK_STATIC_LINKING}" -ne 0 ]]; then
- binaries="$(scanelf -qs +Py_Initialize < <(grep -E "^obj" "${contents_file}" | cut -d" " -f2 | grep -Ev "^/usr/lib(32|64)?/debug/") | sed "s/.* //")"
+ binaries="$(scanelf -qs +Py_Initialize < <(grep -E "^obj" "${contents_file}" | cut -d" " -f2 | grep -Ev "^@GENTOO_PORTAGE_EPREFIX@/usr/lib(32|64)?/debug/") | sed "s/.* //")"
if [[ -n "${binaries}" ]]; then
PKGS_TO_REMERGE+=" ${CATPKGVER}"
eindent
@@ -908,7 +923,9 @@ for contents_file in $(find ${PKG_DBDIR}/ -name CONTENTS | sort); do
fi
if [[ "${CHECK_SHARED_LINKING}" -ne 0 ]]; then
- binaries="$(scanelf -qF "%F %n" < <(grep -E "^obj" "${contents_file}" | cut -d" " -f2 | grep -Ev "^/usr/lib(32|64)?/debug/") | grep -E "( |,)$(get_OLD_PYTHON_SHARED_LIBRARIES_REGEX)(,|$)")"
+ binaries="$(scanelf -qF "%F %n" < <(grep -E "^obj" "${contents_file}" | cut -d" " -f2 | grep -Ev "^@GENTOO_PORTAGE_EPREFIX@/usr/lib(32|64)?/debug/") | grep -E "( |,)$(get_OLD_PYTHON_SHARED_LIBRARIES_REGEX)(,|$)")"
+ [[ -z ${binaries} ]] && \
+ binaries="$(scanmacho -qF "%F %n" < <(grep -E "^obj" "${contents_file}" | cut -d" " -f2) | grep -E "( |,)$(get_OLD_PYTHON_SHARED_LIBRARIES_REGEX)(,|$)")"
if [[ -n "${binaries}" ]]; then
PKGS_TO_REMERGE+=" ${CATPKGVER}"
eindent
@@ -938,7 +955,7 @@ fi
if [[ "${PMS_COMMAND[${PMS_INDEX}]}" == "emerge" ]] ; then
# Filter out --getbinpkg, --getbinpkgonly, --usepkg and --usepkgonly options in EMERGE_DEFAULT_OPTS environment variable
emerge_default_opts=""
- for option in $(/usr/bin/portageq envvar EMERGE_DEFAULT_OPTS); do
+ for option in $("@GENTOO_PORTAGE_EPREFIX@"/usr/bin/portageq envvar EMERGE_DEFAULT_OPTS); do
if [[ "${option}" == -[[:alnum:]]* ]]; then
[[ "${option//[gGkK]/}" != "-" ]] && emerge_default_opts+=" ${option//[gGkK]/}"
elif [[ "${option}" != "--getbinpkg" && "${option}" != "--getbinpkgonly" && "${option}" != "--usepkg" && "${option}" != "--usepkgonly" ]]; then
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] proj/python-updater:master commit in: /
@ 2014-03-16 18:09 Mike Gilbert
0 siblings, 0 replies; 13+ messages in thread
From: Mike Gilbert @ 2014-03-16 18:09 UTC (permalink / raw
To: gentoo-commits
commit: e8bf352d60c5ea83d09a294fe217c905b176d5a2
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 16 17:44:34 2014 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Mar 16 18:00:02 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/python-updater.git;a=commit;h=e8bf352d
Add an install target to the Makefile
---
Makefile | 27 ++++++++++++++++++++-------
python-updater => python-updater.in | 0
2 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/Makefile b/Makefile
index 30d33b8..a723c79 100644
--- a/Makefile
+++ b/Makefile
@@ -1,21 +1,34 @@
# Makefile for python-updater
MAN_INCLUDE=man.include
VERSION=$(shell ./python-updater -V)
-FILES=AUTHORS python-updater python-updater.1
+FILES=AUTHORS Makefile $(MAN_INCLUDE) python-updater.in python-updater.1
PKGDIR=python-updater-$(VERSION)
TARBALL=$(PKGDIR).tar.bz2
+INSTALL ?= install
+sbindir = $(EPREFIX)/usr/sbin
+mandir = $(EPREFIX)/usr/share/man
-all: python-updater.1 tarball
+all: python-updater python-updater.1
-python-updater.1: python-updater $(MAN_INCLUDE)
+python-updater: python-updater.in
+ sed -e "s:@GENTOO_PORTAGE_EPREFIX@:$(EPREFIX):g" $^ > $@
+ chmod +x $@
+
+python-updater.1: $(MAN_INCLUDE)
help2man -L C -Ni $(MAN_INCLUDE) ./python-updater -o $@
sed -i -e 's/ in the manpage//' \
-e 's/\*[[:space:]]\([[:alpha:]]*\).*/\1 /' $@
-.PHONY: all clean tarball upload
-clean:
- rm -fr python-updater.1 *.bz2 $(PKGDIR) || true
-tarball: $(FILES)
+install: python-updater python-updater.1
+ $(INSTALL) -d $(DESTDIR)$(sbindir)
+ $(INSTALL) -m0755 python-updater $(DESTDIR)$(sbindir)
+ $(INSTALL) -d $(DESTDIR)$(mandir)/man1
+ $(INSTALL) -m0644 python-updater.1 $(DESTDIR)$(mandir)/man1
+
+.PHONY: all clean tarball upload install
+clean: python-updater
+ rm -fr python-updater python-updater.1 *.bz2 $(PKGDIR) || true
+tarball: $(FILES) python-updater
mkdir -p $(PKGDIR)
cp $(FILES) $(PKGDIR)
tar -cjf $(TARBALL) $(PKGDIR)
diff --git a/python-updater b/python-updater.in
old mode 100755
new mode 100644
similarity index 100%
rename from python-updater
rename to python-updater.in
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] proj/python-updater:master commit in: /
@ 2014-03-17 3:46 Mike Gilbert
0 siblings, 0 replies; 13+ messages in thread
From: Mike Gilbert @ 2014-03-17 3:46 UTC (permalink / raw
To: gentoo-commits
commit: c42cf6d80aa2e5f9faef11913134c15af20d0664
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 17 03:46:28 2014 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Mar 17 03:46:28 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/python-updater.git;a=commit;h=c42cf6d8
Source /etc/init.d/functions.sh as a fallback.
---
python-updater.in | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/python-updater.in b/python-updater.in
index f079316..2e5de5b 100644
--- a/python-updater.in
+++ b/python-updater.in
@@ -62,7 +62,14 @@ CHECK_SHARED_LINKING="1"
CHECK_STATIC_LINKING="1"
# Load the Gentoo-style info macros
-. "@GENTOO_PORTAGE_EPREFIX@"/lib/gentoo/functions.sh
+if [[ -e "@GENTOO_PORTAGE_EPREFIX@"/lib/gentoo/functions.sh ]]; then
+ . "@GENTOO_PORTAGE_EPREFIX@"/lib/gentoo/functions.sh
+elif [[ -e "@GENTOO_PORTAGE_EPREFIX@"/etc/init.d/functions.sh ]]; then
+ . "@GENTOO_PORTAGE_EPREFIX@"/etc/init.d/functions.sh
+else
+ echo "Unable to find functions.sh"
+ exit 1
+fi
# Portage variables.
PKG_DBDIR="@GENTOO_PORTAGE_EPREFIX@/var/db/pkg"
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] proj/python-updater:master commit in: /
@ 2014-04-07 14:11 Mike Gilbert
0 siblings, 0 replies; 13+ messages in thread
From: Mike Gilbert @ 2014-04-07 14:11 UTC (permalink / raw
To: gentoo-commits
commit: 6d6a425ff016261fd68de877d62b8b27492d0144
Author: Naohiro Aota <naota <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 29 04:14:16 2014 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Apr 7 14:03:08 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/python-updater.git;a=commit;h=6d6a425f
Update sed search path
---
python-updater.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/python-updater.in b/python-updater.in
index 2e5de5b..e66fc07 100644
--- a/python-updater.in
+++ b/python-updater.in
@@ -505,7 +505,7 @@ while (($#)); do
done
if [[ "${PMS_COMMAND[${PMS_INDEX}]}" == "emerge" ]]; then
- sed="$("@GENTOO_PORTAGE_EPREFIX@"/usr/bin/python -c "import os; print(os.path.dirname(os.path.realpath('$(type -p emerge)')))")/ebuild-helpers/sed"
+ sed="$("@GENTOO_PORTAGE_EPREFIX@"/usr/bin/python -c "import os; print(os.path.dirname(os.path.realpath('$(type -p emerge)')))")/ebuild-helpers/bsd/sed"
if [[ -x "${sed}" ]]; then
alias sed="${sed}"
fi
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] proj/python-updater:master commit in: /
@ 2014-04-07 14:11 Mike Gilbert
0 siblings, 0 replies; 13+ messages in thread
From: Mike Gilbert @ 2014-04-07 14:11 UTC (permalink / raw
To: gentoo-commits
commit: d52dec16c619b775bb0ec0808e12578a342c4f51
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 7 14:04:29 2014 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Apr 7 14:04:29 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/python-updater.git;a=commit;h=d52dec16
Update version.
---
python-updater.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/python-updater.in b/python-updater.in
index e66fc07..ad58f5e 100644
--- a/python-updater.in
+++ b/python-updater.in
@@ -25,7 +25,7 @@ if [[ "${BASH_VERSINFO[0]}" -lt 4 ]]; then
exit 1
fi
-VERSION="0.12"
+VERSION="0.13"
OLD_PYTHON_VERSIONS=""
OLD_PYTHON2_VERSIONS=""
OLD_PYTHON3_VERSIONS=""
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] proj/python-updater:master commit in: /
@ 2015-12-10 19:26 Mike Gilbert
0 siblings, 0 replies; 13+ messages in thread
From: Mike Gilbert @ 2015-12-10 19:26 UTC (permalink / raw
To: gentoo-commits
commit: 0da0eb273a09e11bb9b3f4df06cbd79b18ff32be
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 10 19:15:15 2015 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Dec 10 19:15:15 2015 +0000
URL: https://gitweb.gentoo.org/proj/python-updater.git/commit/?id=0da0eb27
All python-updater to function when python2 or python3 is not a symlink
python-updater.in | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/python-updater.in b/python-updater.in
index ad58f5e..271e8b3 100644
--- a/python-updater.in
+++ b/python-updater.in
@@ -512,16 +512,10 @@ if [[ "${PMS_COMMAND[${PMS_INDEX}]}" == "emerge" ]]; then
fi
if has_version "=dev-lang/python-2*"; then
- if [[ "$(readlink "@GENTOO_PORTAGE_EPREFIX@"/usr/bin/python2)" != "python2."* ]]; then
- die "'@GENTOO_PORTAGE_EPREFIX@/usr/bin/python2' is not valid symlink"
- fi
- NEW_PYTHON2_VERSION="$("@GENTOO_PORTAGE_EPREFIX@"/usr/bin/python2 -c 'from sys import version_info; print(".".join([str(x) for x in version_info[:2]]))')"
+ NEW_PYTHON2_VERSION="$("@GENTOO_PORTAGE_EPREFIX@"/usr/bin/python2 -c 'from sys import version_info; print(".".join([str(x) for x in version_info[:2]]))')" || die "Error calling python2"
fi
if has_version "=dev-lang/python-3*"; then
- if [[ "$(readlink "@GENTOO_PORTAGE_EPREFIX@"/usr/bin/python3)" != "python3."* ]]; then
- die "'@GENTOO_PORTAGE_EPREFIX@/usr/bin/python3' is not valid symlink"
- fi
- NEW_PYTHON3_VERSION="$("@GENTOO_PORTAGE_EPREFIX@"/usr/bin/python3 -c 'from sys import version_info; print(".".join([str(x) for x in version_info[:2]]))')"
+ NEW_PYTHON3_VERSION="$("@GENTOO_PORTAGE_EPREFIX@"/usr/bin/python3 -c 'from sys import version_info; print(".".join([str(x) for x in version_info[:2]]))')" || die "Error calling python3"
fi
if [[ -z "${NEW_PYTHON2_VERSION}" && -z "${NEW_PYTHON3_VERSION}" ]]; then
die "Python 2 and Python 3 not installed"
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] proj/python-updater:master commit in: /
@ 2015-12-10 19:26 Mike Gilbert
0 siblings, 0 replies; 13+ messages in thread
From: Mike Gilbert @ 2015-12-10 19:26 UTC (permalink / raw
To: gentoo-commits
commit: 3c47f7b72ac0817a66998b46cb9bba316c7ca0e1
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 10 19:24:00 2015 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Dec 10 19:24:00 2015 +0000
URL: https://gitweb.gentoo.org/proj/python-updater.git/commit/?id=3c47f7b7
Increment version to 0.14
python-updater.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/python-updater.in b/python-updater.in
index 271e8b3..d0b6f69 100644
--- a/python-updater.in
+++ b/python-updater.in
@@ -25,7 +25,7 @@ if [[ "${BASH_VERSINFO[0]}" -lt 4 ]]; then
exit 1
fi
-VERSION="0.13"
+VERSION="0.14"
OLD_PYTHON_VERSIONS=""
OLD_PYTHON2_VERSIONS=""
OLD_PYTHON3_VERSIONS=""
^ permalink raw reply related [flat|nested] 13+ messages in thread
end of thread, other threads:[~2015-12-10 19:26 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-24 15:30 [gentoo-commits] proj/python-updater:master commit in: / Mike Gilbert
-- strict thread matches above, loose matches on Subject: below --
2015-12-10 19:26 Mike Gilbert
2015-12-10 19:26 Mike Gilbert
2014-04-07 14:11 Mike Gilbert
2014-04-07 14:11 Mike Gilbert
2014-03-17 3:46 Mike Gilbert
2014-03-16 18:09 Mike Gilbert
2014-03-16 18:09 Mike Gilbert
2014-03-16 18:09 Mike Gilbert
2014-03-16 18:09 Mike Gilbert
2014-03-12 21:59 Mike Gilbert
2013-03-24 15:28 Mike Gilbert
2013-03-24 15:17 Mike Gilbert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox