Updated patches for py-freebsd with 7.0 support.

Package-Manager: portage-2.1.5.4

5 files changed, 112 insertions, 3 deletions

diff --git a/dev-python/py-freebsd/ChangeLog b/dev-python/py-freebsd/ChangeLog
index 25f224a02622..bc5af2c4123c 100644
--- a/dev-python/py-freebsd/ChangeLog
+++ b/dev-python/py-freebsd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/py-freebsd
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/py-freebsd/ChangeLog,v 1.2 2006/10/28 12:22:11 uberlord Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/py-freebsd/ChangeLog,v 1.3 2008/06/08 19:25:43 the_paya Exp $
+
+*py-freebsd-0.9.3-r1 (08 Jun 2008)
+
+  08 Jun 2008; Javier Villavicencio <the_paya@gentoo.org>
+  +files/fbsd7-netstat.patch, +files/process-fix.patch,
+  +py-freebsd-0.9.3-r1.ebuild:
+  Updated ebuild with FreeBSD-7.0 support
 
   28 Oct 2006; Roy Marples <uberlord@gentoo.org> py-freebsd-0.9.3.ebuild:
   Added ~sparc-fbsd keyword.
diff --git a/dev-python/py-freebsd/Manifest b/dev-python/py-freebsd/Manifest
index 9ce5616cd34b..ce6298432569 100644
--- a/dev-python/py-freebsd/Manifest
+++ b/dev-python/py-freebsd/Manifest
@@ -1,4 +1,7 @@
+AUX fbsd7-netstat.patch 390 RMD160 40b4d4b2707614cd11bde6909fb925dbecdd201b SHA1 a5c973fedee0c04d6d5e71a9ae217780d642d65b SHA256 acfede837e7cacb16ee17c550ec6bdc9cfd907e3727468f2227d90061d6fdd14
+AUX process-fix.patch 1608 RMD160 717636d785118ab8979c5527ce1368fba6bc252d SHA1 0f7e211d2ed9b5ece5210768fca2b7e3fc145fda SHA256 5a3bdc5f54d73eead3bbf59515b3ae5f363e42f695a03accf5bd88ff17bb85f8
 DIST py-freebsd-0.9.3.tar.gz 26995 RMD160 16d891dcc4d1af67c9bd1b92072eddc28f6aa14a SHA1 a8b46a15fc0f530c86ceb9d32e4c38c5784af777 SHA256 4792a5f9d124bd7634890dceeccd9995149176d4d36e17e882eadd4d23b46f92
+EBUILD py-freebsd-0.9.3-r1.ebuild 1077 RMD160 ebe917ebfd1336df29c32536238b9cc68e2fa64e SHA1 9e52d92d31ef2c0f308b82b4bd27f68e72d6bd88 SHA256 9525a9a15cacf70c71cbf1c5e099b196a7ca62437f8d08c3c3565f24e209020b
 EBUILD py-freebsd-0.9.3.ebuild 950 RMD160 704c8ebd6887096d4c4862fbf9bbe02d64356f0d SHA1 49ff03f42e148cc18bdc6f7c56ee4aa2b0166f5d SHA256 1b5116c5a9d9231ccab13ffa75184196d59626186a0fabb5b4754247edefb6fb
-MISC ChangeLog 615 RMD160 b00784929c0ad4fab53e8c71b22106cb0c8384eb SHA1 0fa4990c2287f1d390ec46503d0c7276e755f37e SHA256 ee7e4a377240dc78cfdab331696322203db0a0dd7e40424d0c9904a1971dc0f4
+MISC ChangeLog 839 RMD160 b61edf9184b9e7b238842c7ffadc317d14402101 SHA1 24385744c818c2f38a4c0a2df83922f361ec051d SHA256 ec532a7d7ba66d94c3f7a758d393403a83215efa19e2b54c341e94f2918af826
 MISC metadata.xml 176 RMD160 f70cb6f594542f1bbce030c5c44b8de48dd4392a SHA1 c5a4dcb6c566ea6fdb13828d63376a82563853bb SHA256 17e1b3544b5836d88f6ed59f62fefa3b1e80fc05c81b07df31b5e607a05719b6
diff --git a/dev-python/py-freebsd/files/fbsd7-netstat.patch b/dev-python/py-freebsd/files/fbsd7-netstat.patch
new file mode 100644
index 000000000000..11ae01cc4d6c
--- /dev/null
+++ b/dev-python/py-freebsd/files/fbsd7-netstat.patch
@@ -0,0 +1,10 @@
+--- src/netstat.c.orig	2007-08-17 13:07:10.654911645 -0500
++++ src/netstat.c	2007-08-17 13:07:19.496912514 -0500
+@@ -243,7 +243,6 @@
+ 		Py_DECREF(t);
+ 		p_int(type);        p_int(physical);
+ 		p_int(addrlen);     p_int(hdrlen);
+-		p_int(recvquota);   p_int(xmitquota);
+ 		p_long(mtu);        p_long(metric);
+ 		p_long(baudrate);   p_long(ipackets);
+ 		p_long(ierrors);    p_long(opackets);
diff --git a/dev-python/py-freebsd/files/process-fix.patch b/dev-python/py-freebsd/files/process-fix.patch
new file mode 100644
index 000000000000..910492080eb0
--- /dev/null
+++ b/dev-python/py-freebsd/files/process-fix.patch
@@ -0,0 +1,52 @@
+--- src/process.c.orig	Sun May  8 08:55:00 2005
++++ src/process.c	Sat Nov 25 18:12:52 2006
+@@ -51,10 +51,19 @@
+ static PyObject *
+ PyFB_setprogname(PyObject *self, PyObject *args)
+ {
+-	char *progname;
++	const char	*progname;
++	static PyObject	*namestr = NULL;
+ 
+ 	if (!PyArg_ParseTuple(args, "s:setprogname", &progname))
+ 		return NULL;
++	/*
++	 * Setprogname(3) does not copy the string, it only stores the
++	 * string pointer. Make sure that the string object does not
++	 * get garbage collected and its memory reused!
++	 */
++	Py_XDECREF(namestr);	/* maybe free old progname */
++	PyArg_ParseTuple(args, "O", &namestr);
++	Py_INCREF(namestr);	/* keep new progname object */
+ 
+ 	setprogname(progname);
+ 	Py_RETURN_NONE;
+@@ -64,16 +73,24 @@
+ static char PyFB_setproctitle__doc__[] =
+ "setproctitle(title):\n"
+ "The setproctitle() library routine sets the process title that\n"
+-"appears on the ps(1) command.";
++"appears on the ps(1) command. The progname and a colon are\n"
++"prepended automatically. This behaviour is suppressed when the\n"
++"title starts with a dash (-) character. Calling with a None\n"
++"argument restores a default process title.";
+ 
+ static PyObject *
+ PyFB_setproctitle(PyObject *self, PyObject *args)
+ {
+-	char *newtitle;
++	const char *newtitle;
+ 
+-	if (!PyArg_ParseTuple(args, "s:setproctitle", &newtitle))
++	if (!PyArg_ParseTuple(args, "z:setproctitle", &newtitle))
+ 		return NULL;
+ 
+-	setproctitle(newtitle);
++	if (newtitle == NULL)
++		setproctitle(NULL);
++	else if (*newtitle == '-')
++		setproctitle("-%s", newtitle+1);
++	else
++		setproctitle("%s", newtitle);
+ 	Py_RETURN_NONE;
+ }
diff --git a/dev-python/py-freebsd/py-freebsd-0.9.3-r1.ebuild b/dev-python/py-freebsd/py-freebsd-0.9.3-r1.ebuild
new file mode 100644
index 000000000000..263d062473e4
--- /dev/null
+++ b/dev-python/py-freebsd/py-freebsd-0.9.3-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/py-freebsd/py-freebsd-0.9.3-r1.ebuild,v 1.1 2008/06/08 19:25:43 the_paya Exp $
+
+inherit distutils
+
+DESCRIPTION="Python interface to FreeBSD-specific system libraries"
+HOMEPAGE="http://www.freebsd.org/cgi/cvsweb.cgi/ports/devel/py-freebsd/"
+SRC_URI="mirror://freebsd/ports/local-distfiles/perky/${P}.tar.gz
+	http://people.freebsd.org/~perky/distfiles/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="sys-freebsd/freebsd-lib
+	dev-lang/python"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/fbsd7-netstat.patch"
+	epatch "${FILESDIR}/process-fix.patch"
+}
+
+src_test() {
+	mkdir "${T}/tests"
+	"${python}" setup.py install --home="${T}/tests"
+
+	export PYTHONPATH="${T}/tests/$(get_libdir)/python"
+	"${python}" "${S}/tests/test_kqueue.py" || die "test_kqueue failed"
+	"${python}" "${S}/tests/test_sysctl.py" || die "test_sysctl failed"
+
+	rm -rf "${T}/tests"
+}