Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Robin Cook (123a3f9fc2c09b76867bb2cc9a5ffd70abc6b2ed)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Robin Cook <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Robin Cook (123a3f9fc2c09b76867bb2cc9a5ffd70abc6b2ed)
  • Date: Sat, 14 Jan 2012 11:55:29 -0600

GIT changes to master grimoire by Robin Cook <rcook AT wyrms.net>:

dev/null |binary
devel/python/HISTORY | 5 +++++
devel/python/INSTALL | 11 +++++++++++
devel/python/PRE_BUILD | 4 ++++
devel/python3/HISTORY | 5 +++++
devel/python3/INSTALL | 10 ++++++++++
devel/python3/PRE_BUILD | 4 ++++
python-pypi/calibre/DETAILS | 4 ++--
python-pypi/calibre/HISTORY | 4 ++++
python-pypi/calibre/PRE_BUILD | 5 ++++-
python-pypi/calibre/calibre-0.8.27.tar.gz.sig | 0
python-pypi/calibre/calibre-0.8.35.tar.xz.sig |binary
12 files changed, 49 insertions(+), 3 deletions(-)

New commits:
commit 123a3f9fc2c09b76867bb2cc9a5ffd70abc6b2ed
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

calibre: updated to 0.8.35

commit 163fe097fca966a32f07abb97ac4ff906a863112
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

python3: https://bugs.gentoo.org/374579 added same to fix installs.

commit eb13990ae410ed2cfa5d428297f648f216a6810e
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

python: https://bugs.gentoo.org/374579 to fix installs by some python
spells.

diff --git a/devel/python/HISTORY b/devel/python/HISTORY
index 58fbb6d..d55bb20 100644
--- a/devel/python/HISTORY
+++ b/devel/python/HISTORY
@@ -1,3 +1,8 @@
+2012-01-14 Robin Cook <rcook AT wyrms.net>
+ * PRE_BUILD: added to fix linux2/linux3 issue
+ * INSTALL: added copying of plat directory
+ https://bugs.gentoo.org/374579
+
2011-10-23 Vlad Glagolev <stealth AT sourcemage.org>
* PROVIDES: added, provides PYTHON

diff --git a/devel/python/INSTALL b/devel/python/INSTALL
index a205210..86ae17c 100755
--- a/devel/python/INSTALL
+++ b/devel/python/INSTALL
@@ -7,3 +7,14 @@ fi &&
# 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
+
diff --git a/devel/python/PRE_BUILD b/devel/python/PRE_BUILD
new file mode 100755
index 0000000..ee53ba4
--- /dev/null
+++ b/devel/python/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY/Lib &&
+
+cp -R plat-linux2 plat-linux3
diff --git a/devel/python3/HISTORY b/devel/python3/HISTORY
index b503fc0..e08234c 100644
--- a/devel/python3/HISTORY
+++ b/devel/python3/HISTORY
@@ -1,3 +1,8 @@
+2012-01-14 Robin Cook <rcook AT wyrms.net>
+ * PRE_BUILD: added to fix linux2/linux3 issue
+ * INSTALL: added copying of plat directory
+ https://bugs.gentoo.org/374579
+
2011-10-23 Vlad Glagolev <stealth AT sourcemage.org>
* PROVIDES: added, provides PYTHON

diff --git a/devel/python3/INSTALL b/devel/python3/INSTALL
index c3531de..82047e1 100755
--- a/devel/python3/INSTALL
+++ b/devel/python3/INSTALL
@@ -7,3 +7,13 @@ fi &&
# 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
diff --git a/devel/python3/PRE_BUILD b/devel/python3/PRE_BUILD
new file mode 100755
index 0000000..ee53ba4
--- /dev/null
+++ b/devel/python3/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY/Lib &&
+
+cp -R plat-linux2 plat-linux3
diff --git a/python-pypi/calibre/DETAILS b/python-pypi/calibre/DETAILS
index e1a3108..4c874ee 100755
--- a/python-pypi/calibre/DETAILS
+++ b/python-pypi/calibre/DETAILS
@@ -1,6 +1,6 @@
SPELL=calibre
- VERSION=0.8.27
- SOURCE="${SPELL}-${VERSION}.tar.gz"
+ VERSION=0.8.35
+ SOURCE="${SPELL}-${VERSION}.tar.xz"
SOURCE_URL[0]=http://calibre-ebook.googlecode.com/files/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}"
diff --git a/python-pypi/calibre/HISTORY b/python-pypi/calibre/HISTORY
index dbfc662..320d6ef 100644
--- a/python-pypi/calibre/HISTORY
+++ b/python-pypi/calibre/HISTORY
@@ -1,3 +1,7 @@
+2012-01-14 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 0.8.35
+ * PRE_BUILD: added to exract the xz archive
+
2011-11-18 Sukneet Basuta <sukneet AT sourcemage.org>
* DETAILS: updated spell to 0.8.27
* DEPENDS: added depends icu, dnspython
diff --git a/python-pypi/calibre/PRE_BUILD b/python-pypi/calibre/PRE_BUILD
index d0009d9..c2617f0 100755
--- a/python-pypi/calibre/PRE_BUILD
+++ b/python-pypi/calibre/PRE_BUILD
@@ -1,4 +1,7 @@
-default_pre_build &&
+mk_source_dir $SOURCE_DIRECTORY &&
+cd $BUILD_DIRECTORY &&
+verify_file '' &&
+xz -dc $SOURCE_CACHE/$SOURCE | tar -xf -
cd $SOURCE_DIRECTORY &&

if [ "$CALIBRE_PHOME" = "y" ]; then
diff --git a/python-pypi/calibre/calibre-0.8.27.tar.gz.sig
b/python-pypi/calibre/calibre-0.8.27.tar.gz.sig
deleted file mode 100644
index e34e0df..0000000
Binary files a/python-pypi/calibre/calibre-0.8.27.tar.gz.sig and /dev/null
differ
diff --git a/python-pypi/calibre/calibre-0.8.35.tar.xz.sig
b/python-pypi/calibre/calibre-0.8.35.tar.xz.sig
new file mode 100644
index 0000000..065738a
Binary files /dev/null and b/python-pypi/calibre/calibre-0.8.35.tar.xz.sig
differ



  • [SM-Commit] GIT changes to master grimoire by Robin Cook (123a3f9fc2c09b76867bb2cc9a5ffd70abc6b2ed), Robin Cook, 01/14/2012

Archive powered by MHonArc 2.6.24.

Top of Page