Bug 177021 - [PATCH] net/py-kombu: update to 2.5.7 and fix for py26
Summary: [PATCH] net/py-kombu: update to 2.5.7 and fix for py26
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: William Grzybowski
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-03-16 14:00 UTC by William Grzybowski
Modified: 2013-05-21 13:42 UTC (History)
0 users

See Also:

Attachments
py-kombu.patch (1.85 KB, patch)
2013-03-16 14:00 UTC, William Grzybowski 		no flags Details | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description William Grzybowski 2013-03-16 14:00:00 UTC 
	Update to 2.5.7
	Fix for py26 and new amqp version in ports
	Changes: https://github.com/celery/kombu/blob/master/Changelog
	Redports: https://redports.org/buildarchive/20130316135400-194/

Fix: See attached patch
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-03-16 14:00:40 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->clsung

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 dfilter service freebsd_committer freebsd_triage 2013-05-21 13:26:18 UTC 
Author: wg
Date: Tue May 21 12:26:04 2013
New Revision: 318689
URL: http://svnweb.freebsd.org/changeset/ports/318689

Log:
  - Update to 2.5.7
  - Fix depends for python 2.6
  - Remove article from COMMENT
  - Replace tab for space in pkg-descr (WWW)
  
  Changes: https://github.com/celery/kombu/blob/9c519e8d/Changelog
  
  PR:		ports/177021
  Submitted by:	wg (myself)
  Approved by:	culot (mentor), maintainer (timeout, > 60 days)

Added:
  head/net/py-kombu/files/
  head/net/py-kombu/files/patch-setup.py   (contents, props changed)
Modified:
  head/net/py-kombu/Makefile
  head/net/py-kombu/distinfo
  head/net/py-kombu/pkg-descr

Modified: head/net/py-kombu/Makefile
==============================================================================
--- head/net/py-kombu/Makefile	Tue May 21 12:16:21 2013	(r318688)
+++ head/net/py-kombu/Makefile	Tue May 21 12:26:04 2013	(r318689)
@@ -2,17 +2,17 @@
 # $FreeBSD$
 
 PORTNAME=	kombu
-PORTVERSION=	2.5.6
+PORTVERSION=	2.5.7
 CATEGORIES=	net python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	clsung@FreeBSD.org
-COMMENT=	An AMQP messaging framework for Python
+COMMENT=	AMQP messaging framework for Python
 
 LICENSE=	BSD
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}amqp>=1.0.6:${PORTSDIR}/net/py-amqp \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}amqp>=1.0.9:${PORTSDIR}/net/py-amqp \
 		${PYTHON_PKGNAMEPREFIX}anyjson>=0.3.3:${PORTSDIR}/devel/py-anyjson
 
 OPTIONS_DEFINE=	BEANSTALK BOTO MONGODB REDIS SQLALCHEMY ZMQ
@@ -27,7 +27,10 @@ ZMQ_DESC=	Include ZMQ transport support
 # Ports infrastructure bug
 OPTIONSFILE?=	${PORT_DBDIR}/py-${PORTNAME}/options
 
-.include <bsd.port.options.mk>
+USE_PYTHON=	2.5+
+USE_PYDISTUTILS=	easy_install
+
+.include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MBEANSTALK}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}beanstalkc>0:${PORTSDIR}/net/py-beanstalkc
@@ -53,7 +56,9 @@ RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sql
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pyzmq=>2.2.0:${PORTSDIR}/devel/py-pyzmq
 .endif
 
-USE_PYTHON=	2.5+
-USE_PYDISTUTILS=	easy_install
+.if ${PYTHON_REL} < 270
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}ordereddict>=0:${PORTSDIR}/devel/py-ordereddict \
+		${PYTHON_PKGNAMEPREFIX}importlib>=0:${PORTSDIR}/devel/py-importlib
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Modified: head/net/py-kombu/distinfo
==============================================================================
--- head/net/py-kombu/distinfo	Tue May 21 12:16:21 2013	(r318688)
+++ head/net/py-kombu/distinfo	Tue May 21 12:26:04 2013	(r318689)
@@ -1,2 +1,2 @@
-SHA256 (kombu-2.5.6.tar.gz) = 01c0ba72782535df913b519d6509835f8210b4dbfde652d3a1c6f545d737beb9
-SIZE (kombu-2.5.6.tar.gz) = 301670
+SHA256 (kombu-2.5.7.tar.gz) = 32bcfabc02366738101861f06e737106dea8d2ea784a588d7a9e1fbd940b7a78
+SIZE (kombu-2.5.7.tar.gz) = 301904

Added: head/net/py-kombu/files/patch-setup.py
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/py-kombu/files/patch-setup.py	Tue May 21 12:26:04 2013	(r318689)
@@ -0,0 +1,8 @@
+diff --git requirements/default.txt requirements/default.txt
+index e0c2232..5c48b92 100644
+--- requirements/default.txt
++++ requirements/default.txt
+@@ -1,2 +1,2 @@
+ anyjson>=0.3.3
+-amqp>=1.0.9,<1.1.0
++amqp>=1.0.9

Modified: head/net/py-kombu/pkg-descr
==============================================================================
--- head/net/py-kombu/pkg-descr	Tue May 21 12:16:21 2013	(r318688)
+++ head/net/py-kombu/pkg-descr	Tue May 21 12:26:04 2013	(r318689)
@@ -18,4 +18,4 @@ Features:
       supporting timeouts and the ability to wait for events on
       more than one channel.
 
-WWW:	http://github.com/ask/kombu
+WWW: http://github.com/ask/kombu
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 3 William Grzybowski freebsd_committer freebsd_triage 2013-05-21 13:42:03 UTC 
Responsible Changed
From-To: clsung->wg

I'll take it.
Comment 4 William Grzybowski freebsd_committer freebsd_triage 2013-05-21 13:42:07 UTC 
State Changed
From-To: open->closed

Committed. Thanks!