mgorny      15/01/01 23:08:42

  Modified:             amqplib-0.6.1-r1.ebuild amqplib-1.0.2-r1.ebuild
                        ChangeLog
  Log:
  Backport some improvements from the newer ebuild. Fix python_test(). Do not 
rely on non-well-defined "foo/" behavior.
  
  (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 
EFB4464E!)

Revision  Changes    Path
1.3                  dev-python/amqplib/amqplib-0.6.1-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/amqplib/amqplib-0.6.1-r1.ebuild?rev=1.3&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/amqplib/amqplib-0.6.1-r1.ebuild?rev=1.3&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/amqplib/amqplib-0.6.1-r1.ebuild?r1=1.2&r2=1.3

Index: amqplib-0.6.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/amqplib/amqplib-0.6.1-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- amqplib-0.6.1-r1.ebuild     5 Sep 2013 18:46:11 -0000       1.2
+++ amqplib-0.6.1-r1.ebuild     1 Jan 2015 23:08:42 -0000       1.3
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/dev-python/amqplib/amqplib-0.6.1-r1.ebuild,v 1.2 
2013/09/05 18:46:11 mgorny Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/dev-python/amqplib/amqplib-0.6.1-r1.ebuild,v 1.3 
2015/01/01 23:08:42 mgorny Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_6 python2_7 )
@@ -19,31 +19,25 @@
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND=""
 
-python_prepare_all() {
-       if use test; then
-               epatch "${FILESDIR}/${P}_disable_socket_tests.patch"
-       fi
-       distutils-r1_python_prepare_all
-}
+PATCHES=(
+       "${FILESDIR}/${P}_disable_socket_tests.patch"
+)
 
 python_test() {
-       testing() {
-               PYTHONPATH="build-${PYTHON_ABI}/lib" python \
-                       "tests/client_0_8/run_all.py"
-       }
-       python_execute_function testing
+       "${PYTHON}" tests/client_0_8/run_all.py \
+               || die "Tests fail with ${EPYTHON}"
 }
 
 python_install_all() {
        distutils-r1_python_install_all
 
-       dodoc docs/*
+       dodoc -r docs/.
        if use examples; then
                docinto examples
-               dodoc demo/* || die "dodoc failed"
+               dodoc -r demo/.
        fi
        if use extras; then
                insinto /usr/share/${PF}
-               doins -r extras || die "doins failed"
+               doins -r extras
        fi
 }



1.5                  dev-python/amqplib/amqplib-1.0.2-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/amqplib/amqplib-1.0.2-r1.ebuild?rev=1.5&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/amqplib/amqplib-1.0.2-r1.ebuild?rev=1.5&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/amqplib/amqplib-1.0.2-r1.ebuild?r1=1.4&r2=1.5

Index: amqplib-1.0.2-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/amqplib/amqplib-1.0.2-r1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- amqplib-1.0.2-r1.ebuild     1 Jun 2014 11:33:29 -0000       1.4
+++ amqplib-1.0.2-r1.ebuild     1 Jan 2015 23:08:42 -0000       1.5
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/dev-python/amqplib/amqplib-1.0.2-r1.ebuild,v 1.4 
2014/06/01 11:33:29 idella4 Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/dev-python/amqplib/amqplib-1.0.2-r1.ebuild,v 1.5 
2015/01/01 23:08:42 mgorny Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
@@ -29,11 +29,10 @@
 python_install_all() {
        distutils-r1_python_install_all
 
-       dodoc -r docs/
+       dodoc -r docs/.
        if use examples; then
                docinto examples
                dodoc -r demo/.
-               docompress -x /usr/share/doc/${PF}/examples
        fi
        if use extras; then
                insinto /usr/share/${PF}



1.9                  dev-python/amqplib/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/amqplib/ChangeLog?rev=1.9&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/amqplib/ChangeLog?rev=1.9&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/amqplib/ChangeLog?r1=1.8&r2=1.9

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/amqplib/ChangeLog,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ChangeLog   1 Jun 2014 11:33:29 -0000       1.8
+++ ChangeLog   1 Jan 2015 23:08:42 -0000       1.9
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/amqplib
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/amqplib/ChangeLog,v 1.8 
2014/06/01 11:33:29 idella4 Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/amqplib/ChangeLog,v 1.9 
2015/01/01 23:08:42 mgorny Exp $
+
+  01 Jan 2015; Michał Górny <[email protected]> amqplib-0.6.1-r1.ebuild,
+  amqplib-1.0.2-r1.ebuild:
+  Backport some improvements from the newer ebuild. Fix python_test(). Do not
+  rely on non-well-defined "foo/" behavior.
 
   01 Jun 2014; Ian Delaney <[email protected]> amqplib-1.0.2-r1.ebuild:
   drop py2.6 pypy2_0 add py3.4 support




Reply via email to