diff --git a/devel/python3/CONFIGURE b/devel/python3/CONFIGURE
index 81a0a33..dfbe08c 100755
--- a/devel/python3/CONFIGURE
+++ b/devel/python3/CONFIGURE
@@ -1,4 +1,5 @@
config_query PY3K "Use Python 3 as primary version on the system?" n &&
+config_query SYMLINK "create symlinks for python -> python3" n &&
config_query_option PYTHON3_OPTS \
"Enable IPv6?" y \
diff --git a/devel/python3/CONFLICTS b/devel/python3/CONFLICTS
index ef99b71..4a8ea12 100755
--- a/devel/python3/CONFLICTS
+++ b/devel/python3/CONFLICTS
@@ -1 +1,2 @@
conflicts python3000 y
+conflicts faulthandler y
diff --git a/devel/python3/DETAILS b/devel/python3/DETAILS
index be02097..3a3f8a0 100755
--- a/devel/python3/DETAILS
+++ b/devel/python3/DETAILS
@@ -1,7 +1,6 @@
SPELL=python3
- VERSION=3.2.3
+ VERSION=3.3.0
SECURITY_PATCH=1
- PATCHLEVEL=1
SOURCE=Python-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/Python-$VERSION"
diff --git a/devel/python3/HISTORY b/devel/python3/HISTORY
index 775ed53..fdbfa25 100644
--- a/devel/python3/HISTORY
+++ b/devel/python3/HISTORY
@@ -1,3 +1,8 @@
+2012-10-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.3.0
+ * CONFIGURE, INSTALL: make symlinks optional
+ * CONFLICTS: add faulthandler ( now included in python3)
+
2012-04-24 Treeve Jelbert <treeve AT sourcemage.org>
* INSTALL: add some symlinks
* DETAILS: PATCHLEVEL=1
diff --git a/devel/python3/INSTALL b/devel/python3/INSTALL
index 4d52c1e..5d05a76 100755
--- a/devel/python3/INSTALL
+++ b/devel/python3/INSTALL
@@ -1,24 +1,16 @@
-cp -Rv "$SOURCE_DIRECTORY/anywhere/$INSTALL_ROOT/usr" "$INSTALL_ROOT/" &&
+cp -av "$SOURCE_DIRECTORY/anywhere/$INSTALL_ROOT/usr" "$INSTALL_ROOT/" &&
# gettext
install -vm 755 "$SOURCE_DIRECTORY/Tools/i18n/"{pygettext.py,msgfmt.py} \
"$INSTALL_ROOT/usr/bin"
-
-local PYVER=`echo ${VERSION}|cut -d . -f 1,2`
-
-if [ -d "${INSTALL_ROOT}/usr/lib/python${PYVER}/plat-linux2" ];then
- cp -r "${INSTALL_ROOT}/usr/lib/python${PYVER}/plat-linux2" \
- "${INSTALL_ROOT}/usr/lib/python${PYVER}/plat-linux3"
-else
- cp -r "${INSTALL_ROOT}/usr/lib/python${PYVER}/plat-linux3" \
- "${INSTALL_ROOT}/usr/lib/python${PYVER}/plat-linux2"
-fi &&
# help some stupid installer scripts
local PV=`echo ${VERSION}|cut -c-3` &&
ln -sf ${TRACK_ROOT}/usr/include/python${PV}m
${INSTALL_ROOT}/usr/include/python${PV} &&
# this is the primary/only version of python
if [[ $PY3K == y ]]; then
+ if [[ $SYMLINK == y ]];then
ln -sf ${TRACK_ROOT}/usr/bin/python3 ${INSTALL_ROOT}/usr/bin/python &&
ln -sf ${TRACK_ROOT}/usr/bin/python3-config
${INSTALL_ROOT}/usr/bin/python-config &&
ln -sf ${TRACK_ROOT}/usr/lib/pkgconfig/python-${PV}.pc
${INSTALL_ROOT}/usr/lib/pkgconfig/python.pc
+ fi
fi
diff --git a/devel/python3/PRE_BUILD b/devel/python3/PRE_BUILD
deleted file mode 100755
index ee53ba4..0000000
--- a/devel/python3/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY/Lib &&
-
-cp -R plat-linux2 plat-linux3
diff --git a/editors/elvis/CONFIGURE b/editors/elvis/CONFIGURE
index 23d189e..4cc297b 100755
--- a/editors/elvis/CONFIGURE
+++ b/editors/elvis/CONFIGURE
@@ -1,6 +1,7 @@
-config_query MAKE_SYMLINK "Would you like to have /usr/bin/vi as a symlink
to /usr/bin/elvis?" n
+config_query MAKE_SYMLINK "Would you like to have /usr/bin/vi as a symlink
to /usr/bin/elvis?" n &&
+
if [ "${MAKE_SYMLINK}" == "y" ] ; then
- if [ -e /usr/bin/vi ] ; then
+ if [ -e /usr/bin/vi ] && `readlink -f "/usr/bin/vi" | grep -viq
"elvis"`; then
echo "VI is already provided by vim." &&
echo "To have elvis as provider of vi, recast vim with the vi
symlink option disabled, then recast elvis." &&
MAKE_SYMLINK="n"
diff --git a/editors/elvis/HISTORY b/editors/elvis/HISTORY
index 3744c61..f214ecf 100644
--- a/editors/elvis/HISTORY
+++ b/editors/elvis/HISTORY
@@ -1,3 +1,6 @@
+2012-10-19 Vlad Glagolev <stealth AT sourcemage.org>
+ * CONFIGURE: corrected symlink check
+
2012-05-13 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: removed UPDATED; quoting paths
* DEPENDS: killed xorg-libs, see #14699 on old bug tracker; added
diff --git a/gnome2-libs/librsvg2/DETAILS b/gnome2-libs/librsvg2/DETAILS
index baa1a8b..e01ab7d 100755
--- a/gnome2-libs/librsvg2/DETAILS
+++ b/gnome2-libs/librsvg2/DETAILS
@@ -1,6 +1,6 @@
SPELL=librsvg2
- VERSION=2.36.3
-
SOURCE_HASH=sha512:265160168fefcebeace6ecd964487277756fc01fcd70d40fff06ac35903b47c2dc65fcb90d21f48610bc79a6bfe2c946bbff5644c14a5cdcf94364adf0b9400a
+ VERSION=2.36.4
+
SOURCE_HASH=sha512:447435b2fab0ca7147b68c02a622df8049d56844360e8e361bf5abfbec12c33d46393bad3c099c2819f68d1b7595616d1f35d2cea58ee94d873c1c34e9362d37
# SOURCE_GPG=gurus.gpg:$SOURCE.sig
SECURITY_PATCH=1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
diff --git a/gnome2-libs/librsvg2/HISTORY b/gnome2-libs/librsvg2/HISTORY
index 8762280..59e34ed 100644
--- a/gnome2-libs/librsvg2/HISTORY
+++ b/gnome2-libs/librsvg2/HISTORY
@@ -1,3 +1,6 @@
+2012-10-21 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.36.4
+
2012-09-16 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.36.3