Date: Wednesday, October 17, 2012 @ 06:20:01
Author: allan
Revision: 169010
db-move: moved python-cairo from [testing] to [extra] (i686, x86_64)
Added:
python-cairo/repos/extra-i686/PKGBUILD
(from rev 168989, python-cairo/repos/testing-i686/PKGBUILD)
python-cairo/repos/extra-x86_64/PKGBUILD
(from rev 168989, python-cairo/repos/testing-x86_64/PKGBUILD)
Deleted:
python-cairo/repos/extra-i686/PKGBUILD
python-cairo/repos/extra-i686/pycairo-1.8.10-pypath.patch
python-cairo/repos/extra-x86_64/PKGBUILD
python-cairo/repos/extra-x86_64/pycairo-1.8.10-pypath.patch
python-cairo/repos/testing-i686/
python-cairo/repos/testing-x86_64/
------------------------------------------+
extra-i686/PKGBUILD | 76 ++++++++++++-----------------
extra-i686/pycairo-1.8.10-pypath.patch | 36 -------------
extra-x86_64/PKGBUILD | 76 ++++++++++++-----------------
extra-x86_64/pycairo-1.8.10-pypath.patch | 36 -------------
4 files changed, 68 insertions(+), 156 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-10-17 10:19:59 UTC (rev 169009)
+++ extra-i686/PKGBUILD 2012-10-17 10:20:01 UTC (rev 169010)
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer: Angel Velasquez <[email protected]>
-# Maintainer: Jan de Groot <[email protected]>
-
-pkgname=python-cairo
-pkgver=1.10.0
-pkgrel=1
-pkgdesc="Python bindings for the cairo graphics library"
-arch=('i686' 'x86_64')
-license=('LGPL3')
-depends=('python' 'cairo')
-makedepends=('pkg-config')
-options=('!libtool')
-source=(http://cairographics.org/releases/pycairo-${pkgver}.tar.bz2)
-url="http://www.cairographics.org/pycairo";
-md5sums=('e6fd3f2f1e6a72e0db0868c4985669c5')
-
-build() {
- cd "${srcdir}/pycairo-${pkgver}"
-
- # We patch the embedded copy of waf to fix compiling against python 3.2
- # (due to PEP-3149), by using the appropriate python-config tool, rather
- # than trying to find the libraries by directly using PYTHON_VERSION
-
- # Ensure that ./waf has created the cached unpacked version
- # of the wafadmin source tree.
- # This will be created to a subdirectory like
- # .waf3-1.5.18-a7b91e2a913ce55fa6ecdf310df95752
- python ./waf --version
-
- # Patch the unpacked version of waf:
- pushd .waf3*
- popd
-
- ./waf configure --prefix=/usr
- ./waf build
-}
-
-package() {
- cd "${srcdir}/pycairo-${pkgver}"
- ./waf install --destdir="${pkgdir}"
-}
Copied: python-cairo/repos/extra-i686/PKGBUILD (from rev 168989,
python-cairo/repos/testing-i686/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-10-17 10:20:01 UTC (rev 169010)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Angel Velasquez <[email protected]>
+# Maintainer: Jan de Groot <[email protected]>
+
+pkgname=python-cairo
+pkgver=1.10.0
+pkgrel=2
+pkgdesc="Python bindings for the cairo graphics library"
+arch=('i686' 'x86_64')
+license=('LGPL3')
+depends=('python' 'cairo')
+makedepends=('pkg-config')
+options=('!libtool')
+source=(http://cairographics.org/releases/pycairo-${pkgver}.tar.bz2)
+url="http://www.cairographics.org/pycairo";
+md5sums=('e6fd3f2f1e6a72e0db0868c4985669c5')
+
+build() {
+ cd "${srcdir}/pycairo-${pkgver}"
+
+ # Ensure that ./waf has created the cached unpacked version
+ # of the wafadmin source tree.
+ # This will be created to a subdirectory like
+ # .waf3-1.5.18-a7b91e2a913ce55fa6ecdf310df95752
+ python3 ./waf --version
+
+ ./waf configure --prefix=/usr
+ ./waf build
+}
+
+package() {
+ cd "${srcdir}/pycairo-${pkgver}"
+ ./waf install --destdir="${pkgdir}"
+}
Deleted: extra-i686/pycairo-1.8.10-pypath.patch
===================================================================
--- extra-i686/pycairo-1.8.10-pypath.patch 2012-10-17 10:19:59 UTC (rev
169009)
+++ extra-i686/pycairo-1.8.10-pypath.patch 2012-10-17 10:20:01 UTC (rev
169010)
@@ -1,36 +0,0 @@
-diff -up wafadmin/Tools/python.py.pypath wafadmin/Tools/python.py
---- wafadmin/Tools/python.py.pypath 2011-02-10 15:30:44.118506004 -0500
-+++ wafadmin/Tools/python.py 2011-02-10 15:32:50.922506002 -0500
-@@ -156,6 +156,9 @@ MACOSX_DEPLOYMENT_TARGET = %r
- env.append_value('LINKFLAGS_PYEMBED',python_LDFLAGS.split())
- result=False
- name='python'+env['PYTHON_VERSION']
-+
python_config=conf.find_program('python%s-config'%('.'.join(env['PYTHON_VERSION'].split('.')[:2])),var='PYTHON_CONFIG')
-+ if not python_config:
-+
python_config=conf.find_program('python-config-%s'%('.'.join(env['PYTHON_VERSION'].split('.')[:2])),var='PYTHON_CONFIG')
- if python_LIBDIR is not None:
- path=[python_LIBDIR]
- conf.log.write("\n\n# Trying LIBDIR: %r\n"%path)
-@@ -169,6 +172,12 @@ MACOSX_DEPLOYMENT_TARGET = %r
- path=[os.path.join(python_prefix,"libs")]
- name='python'+env['PYTHON_VERSION'].replace('.','')
- result=conf.check(lib=name,uselib='PYEMBED',libpath=path)
-+ if not result and python_config:
-+ conf.log.write("\n\n# try again with help of python-config\n")
-+ for libstr in Utils.cmd_output("%s %s
--libs"%(python,python_config)).strip().split():
-+ if(libstr.startswith('-lpython')):
-+ name=libstr[2:]
-+ result=conf.check(lib=name,uselib='PYEMBED',libpath=path)
- if result:
- env['LIBPATH_PYEMBED']=path
- env.append_value('LIB_PYEMBED',name)
-@@ -177,9 +186,6 @@ MACOSX_DEPLOYMENT_TARGET = %r
- if(sys.platform=='win32'or sys.platform.startswith('os2')or
sys.platform=='darwin'or Py_ENABLE_SHARED):
- env['LIBPATH_PYEXT']=env['LIBPATH_PYEMBED']
- env['LIB_PYEXT']=env['LIB_PYEMBED']
--
python_config=conf.find_program('python%s-config'%('.'.join(env['PYTHON_VERSION'].split('.')[:2])),var='PYTHON_CONFIG')
-- if not python_config:
--
python_config=conf.find_program('python-config-%s'%('.'.join(env['PYTHON_VERSION'].split('.')[:2])),var='PYTHON_CONFIG')
- includes=[]
- if python_config:
- for incstr in Utils.cmd_output("%s %s
--includes"%(python,python_config)).strip().split():
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-10-17 10:19:59 UTC (rev 169009)
+++ extra-x86_64/PKGBUILD 2012-10-17 10:20:01 UTC (rev 169010)
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer: Angel Velasquez <[email protected]>
-# Maintainer: Jan de Groot <[email protected]>
-
-pkgname=python-cairo
-pkgver=1.10.0
-pkgrel=1
-pkgdesc="Python bindings for the cairo graphics library"
-arch=('i686' 'x86_64')
-license=('LGPL3')
-depends=('python' 'cairo')
-makedepends=('pkg-config')
-options=('!libtool')
-source=(http://cairographics.org/releases/pycairo-${pkgver}.tar.bz2)
-url="http://www.cairographics.org/pycairo";
-md5sums=('e6fd3f2f1e6a72e0db0868c4985669c5')
-
-build() {
- cd "${srcdir}/pycairo-${pkgver}"
-
- # We patch the embedded copy of waf to fix compiling against python 3.2
- # (due to PEP-3149), by using the appropriate python-config tool, rather
- # than trying to find the libraries by directly using PYTHON_VERSION
-
- # Ensure that ./waf has created the cached unpacked version
- # of the wafadmin source tree.
- # This will be created to a subdirectory like
- # .waf3-1.5.18-a7b91e2a913ce55fa6ecdf310df95752
- python ./waf --version
-
- # Patch the unpacked version of waf:
- pushd .waf3*
- popd
-
- ./waf configure --prefix=/usr
- ./waf build
-}
-
-package() {
- cd "${srcdir}/pycairo-${pkgver}"
- ./waf install --destdir="${pkgdir}"
-}
Copied: python-cairo/repos/extra-x86_64/PKGBUILD (from rev 168989,
python-cairo/repos/testing-x86_64/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-10-17 10:20:01 UTC (rev 169010)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Angel Velasquez <[email protected]>
+# Maintainer: Jan de Groot <[email protected]>
+
+pkgname=python-cairo
+pkgver=1.10.0
+pkgrel=2
+pkgdesc="Python bindings for the cairo graphics library"
+arch=('i686' 'x86_64')
+license=('LGPL3')
+depends=('python' 'cairo')
+makedepends=('pkg-config')
+options=('!libtool')
+source=(http://cairographics.org/releases/pycairo-${pkgver}.tar.bz2)
+url="http://www.cairographics.org/pycairo";
+md5sums=('e6fd3f2f1e6a72e0db0868c4985669c5')
+
+build() {
+ cd "${srcdir}/pycairo-${pkgver}"
+
+ # Ensure that ./waf has created the cached unpacked version
+ # of the wafadmin source tree.
+ # This will be created to a subdirectory like
+ # .waf3-1.5.18-a7b91e2a913ce55fa6ecdf310df95752
+ python3 ./waf --version
+
+ ./waf configure --prefix=/usr
+ ./waf build
+}
+
+package() {
+ cd "${srcdir}/pycairo-${pkgver}"
+ ./waf install --destdir="${pkgdir}"
+}
Deleted: extra-x86_64/pycairo-1.8.10-pypath.patch
===================================================================
--- extra-x86_64/pycairo-1.8.10-pypath.patch 2012-10-17 10:19:59 UTC (rev
169009)
+++ extra-x86_64/pycairo-1.8.10-pypath.patch 2012-10-17 10:20:01 UTC (rev
169010)
@@ -1,36 +0,0 @@
-diff -up wafadmin/Tools/python.py.pypath wafadmin/Tools/python.py
---- wafadmin/Tools/python.py.pypath 2011-02-10 15:30:44.118506004 -0500
-+++ wafadmin/Tools/python.py 2011-02-10 15:32:50.922506002 -0500
-@@ -156,6 +156,9 @@ MACOSX_DEPLOYMENT_TARGET = %r
- env.append_value('LINKFLAGS_PYEMBED',python_LDFLAGS.split())
- result=False
- name='python'+env['PYTHON_VERSION']
-+
python_config=conf.find_program('python%s-config'%('.'.join(env['PYTHON_VERSION'].split('.')[:2])),var='PYTHON_CONFIG')
-+ if not python_config:
-+
python_config=conf.find_program('python-config-%s'%('.'.join(env['PYTHON_VERSION'].split('.')[:2])),var='PYTHON_CONFIG')
- if python_LIBDIR is not None:
- path=[python_LIBDIR]
- conf.log.write("\n\n# Trying LIBDIR: %r\n"%path)
-@@ -169,6 +172,12 @@ MACOSX_DEPLOYMENT_TARGET = %r
- path=[os.path.join(python_prefix,"libs")]
- name='python'+env['PYTHON_VERSION'].replace('.','')
- result=conf.check(lib=name,uselib='PYEMBED',libpath=path)
-+ if not result and python_config:
-+ conf.log.write("\n\n# try again with help of python-config\n")
-+ for libstr in Utils.cmd_output("%s %s
--libs"%(python,python_config)).strip().split():
-+ if(libstr.startswith('-lpython')):
-+ name=libstr[2:]
-+ result=conf.check(lib=name,uselib='PYEMBED',libpath=path)
- if result:
- env['LIBPATH_PYEMBED']=path
- env.append_value('LIB_PYEMBED',name)
-@@ -177,9 +186,6 @@ MACOSX_DEPLOYMENT_TARGET = %r
- if(sys.platform=='win32'or sys.platform.startswith('os2')or
sys.platform=='darwin'or Py_ENABLE_SHARED):
- env['LIBPATH_PYEXT']=env['LIBPATH_PYEMBED']
- env['LIB_PYEXT']=env['LIB_PYEMBED']
--
python_config=conf.find_program('python%s-config'%('.'.join(env['PYTHON_VERSION'].split('.')[:2])),var='PYTHON_CONFIG')
-- if not python_config:
--
python_config=conf.find_program('python-config-%s'%('.'.join(env['PYTHON_VERSION'].split('.')[:2])),var='PYTHON_CONFIG')
- includes=[]
- if python_config:
- for incstr in Utils.cmd_output("%s %s
--includes"%(python,python_config)).strip().split():
