summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Briesenick <sbriesen@gentoo.org>2007-10-16 01:01:20 +0000
committerStefan Briesenick <sbriesen@gentoo.org>2007-10-16 01:01:20 +0000
commit8037aec19c37549834f15fe389f43d132882f46a (patch)
treee22eb91517f8b7969fb9fb27729a2a80faa2afbc /dev-python
parentadded dev-python/pysyck block dependency (diff)
downloadgentoo-2-8037aec19c37549834f15fe389f43d132882f46a.tar.gz
gentoo-2-8037aec19c37549834f15fe389f43d132882f46a.tar.bz2
gentoo-2-8037aec19c37549834f15fe389f43d132882f46a.zip
some cleanups
(Portage version: 2.1.3.12)
Diffstat (limited to 'dev-python')
-rw-r--r--dev-python/pyyaml/ChangeLog6
-rw-r--r--dev-python/pyyaml/files/pyyaml-3.05-libyaml.diff23
-rw-r--r--dev-python/pyyaml/pyyaml-3.05.ebuild20
3 files changed, 38 insertions, 11 deletions
diff --git a/dev-python/pyyaml/ChangeLog b/dev-python/pyyaml/ChangeLog
index 24da0f1c6aaf..74297bb8e63a 100644
--- a/dev-python/pyyaml/ChangeLog
+++ b/dev-python/pyyaml/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-python/pyyaml
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyyaml/ChangeLog,v 1.1 2007/10/05 23:01:23 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyyaml/ChangeLog,v 1.2 2007/10/16 01:01:20 sbriesen Exp $
+
+ 16 Oct 2007; Stefan Briesenick <sbriesen@gentoo.org>
+ +files/pyyaml-3.05-libyaml.diff, pyyaml-3.05.ebuild:
+ some cleanups
*pyyaml-3.05 (05 Oct 2007)
diff --git a/dev-python/pyyaml/files/pyyaml-3.05-libyaml.diff b/dev-python/pyyaml/files/pyyaml-3.05-libyaml.diff
new file mode 100644
index 000000000000..1c1a3a690e12
--- /dev/null
+++ b/dev-python/pyyaml/files/pyyaml-3.05-libyaml.diff
@@ -0,0 +1,23 @@
+diff -Naur PyYAML-3.05.orig/setup.py PyYAML-3.05/setup.py
+--- PyYAML-3.05.orig/setup.py 2007-05-12 23:28:55.000000000 +0200
++++ PyYAML-3.05/setup.py 2007-10-16 02:29:57.000000000 +0200
+@@ -31,6 +31,8 @@
+ ]
+
+ from distutils.core import setup
++from distutils.extension import Extension
++from Pyrex.Distutils import build_ext
+
+ if __name__ == '__main__':
+
+@@ -49,5 +51,10 @@
+
+ package_dir={'': 'lib'},
+ packages=['yaml'],
++ ext_modules=[
++ Extension("_yaml", ["ext/_yaml.pyx"], libraries=['yaml']),
++ ],
++
++ cmdclass = {'build_ext': build_ext}
+ )
+
diff --git a/dev-python/pyyaml/pyyaml-3.05.ebuild b/dev-python/pyyaml/pyyaml-3.05.ebuild
index 1de65da00851..a9f6924623f0 100644
--- a/dev-python/pyyaml/pyyaml-3.05.ebuild
+++ b/dev-python/pyyaml/pyyaml-3.05.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyyaml/pyyaml-3.05.ebuild,v 1.1 2007/10/05 23:01:23 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyyaml/pyyaml-3.05.ebuild,v 1.2 2007/10/16 01:01:20 sbriesen Exp $
inherit distutils
@@ -8,32 +8,32 @@ MY_P="PyYAML-${PV}"
DESCRIPTION="YAML parser and emitter for Python"
HOMEPAGE="http://pyyaml.org/wiki/PyYAML"
-SRC_URI="http://pyyaml.org/download/pyyaml/${MY_P}.tar.gz"
+SRC_URI="http://pyyaml.org/download/${PN}/${MY_P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~x86"
-IUSE="libyaml"
+IUSE="examples libyaml"
-DEPENDS="libyaml? ( dev-libs/libyaml dev-python/pyrex )"
+DEPEND="libyaml? ( dev-libs/libyaml dev-python/pyrex )"
+RDEPEND="libyaml? ( dev-libs/libyaml )"
S="${WORKDIR}/${MY_P}"
PYTHON_MODNAME="yaml"
-DOCS="LICENSE"
src_unpack() {
distutils_src_unpack
if use libyaml; then
cd "${S}"
- mv -f setup.py setup_native.py
- sed -i -e "s:\(from setup\):\1_native:g" setup_with_libyaml.py
- ln -snf setup_with_libyaml.py setup.py
+ epatch "${FILESDIR}/${P}-libyaml.diff"
fi
}
src_install() {
distutils_src_install
- insinto /usr/share/doc/${PF}/examples
- doins -r examples/.
+ if use examples; then
+ insinto /usr/share/doc/${PF}/examples
+ doins -r examples/.
+ fi
}