Version bump. Drop old. Fix bug #299517

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

5 files changed, 57 insertions, 32 deletions

diff --git a/x11-libs/xpyb/ChangeLog b/x11-libs/xpyb/ChangeLog
index 344a5423a40b..7796d5f3c45b 100644
--- a/x11-libs/xpyb/ChangeLog
+++ b/x11-libs/xpyb/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/xpyb
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xpyb/ChangeLog,v 1.8 2009/12/14 11:15:52 remi Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xpyb/ChangeLog,v 1.9 2010/01/03 21:32:55 scarabeus Exp $
+
+*xpyb-1.2 (03 Jan 2010)
+
+  03 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/0001-.la-file-is-totaly-useless-for-python-bindings-and-c.patch,
+  -xpyb-1.0.ebuild, -xpyb-1.1.ebuild, +xpyb-1.2.ebuild:
+  Version bump. Drop old. Fix bug #299517
 
   14 Dec 2009; Rémi Cardona <remi@gentoo.org> xpyb-1.0.ebuild:
   change LICENSE to MIT
diff --git a/x11-libs/xpyb/Manifest b/x11-libs/xpyb/Manifest
index 01985b7a56ce..3a7fab33db41 100644
--- a/x11-libs/xpyb/Manifest
+++ b/x11-libs/xpyb/Manifest
@@ -1,6 +1,5 @@
-DIST xpyb-1.0.tar.bz2 262899 RMD160 e96a8973e76a0880969c1d31f59e8f3b038882c1 SHA1 45b3763c6e31e4b6deaaeb85fdec36826b6da7d9 SHA256 5c9645db96b99786de19acab5c62c87e4c4e2f6b5797d51fc1418c7a98d8ce33
-DIST xpyb-1.1.tar.bz2 267408 RMD160 2448488a3509ac6154ee8a1ed7ec46dee448200c SHA1 e0d087d7a932e5084c17458f8906a7cd8af5a996 SHA256 259c9ff7e6eb458f57437dbdc0f1993b63e1f30bbe0e4272bfeb8df18ff45933
-EBUILD xpyb-1.0.ebuild 679 RMD160 fb8ee0bc797957b9090fca0f15a469e28b9f4a62 SHA1 131084a9e4d6b280729c7f118e6c9770f41c0181 SHA256 76914f77c9bdc781f093ea0cc3b9740387206370e0a4f1a3bf56baeefa9a6ce4
-EBUILD xpyb-1.1.ebuild 677 RMD160 88221ce9f0eb91279077741c6af16aa31a2ca230 SHA1 0744f1dc464450a222f63912be9636f4b09dcf4c SHA256 b9799f16766282add04704d5f80d4341922be27076ab9edbdd11553915104e44
-MISC ChangeLog 1352 RMD160 e1170e112c93b96a5da7932788b4382def2a2276 SHA1 6d9c1e882976b1068bec8cb6d33e1b16807262f0 SHA256 22e00c9ee04a72af59e019d4f7930bd11b1bdc696938db2eec850b61556fa0bd
+AUX 0001-.la-file-is-totaly-useless-for-python-bindings-and-c.patch 1138 RMD160 bbf39938b2112ca32b8217e3ebd531f14b0aca27 SHA1 6e3e1704447e16b22e663a29c9b475418507c702 SHA256 331b7203ba219f688fa1a9be0e0f26bf07a12b84a9daafbac969d3c975f9906f
+DIST xpyb-1.2.tar.bz2 272557 RMD160 9cd8b9e661e0f7c69a6974dce21c7d32dcd95f8e SHA1 1fbb6a128e8c46321e1a5197c6c55c0b884c28fa SHA256 3f2dbebd995ad57deb2af2baae78be8acdda8f08a141444ce0d084245d251ad2
+EBUILD xpyb-1.2.ebuild 827 RMD160 932e3a096c3b6dd405b70f428f10b8517a341a2b SHA1 d3c7406806ba0d424124c8fdf875ac3e2cd6b13c SHA256 406512a486e7a144079c026143d77f788169e84fd8f6b38866bfe80449c690d3
+MISC ChangeLog 1610 RMD160 4642ff663dace5ca98fcd71ffc8f8ba1256f0c12 SHA1 4e81b8ef4fad13f1139b0cd1c998a4d608ce80b3 SHA256 af43553889f539f14537b73520ad52a725799c2363c261d4c94aefd5440b914c
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
diff --git a/x11-libs/xpyb/files/0001-.la-file-is-totaly-useless-for-python-bindings-and-c.patch b/x11-libs/xpyb/files/0001-.la-file-is-totaly-useless-for-python-bindings-and-c.patch
new file mode 100644
index 000000000000..edbc9e380701
--- /dev/null
+++ b/x11-libs/xpyb/files/0001-.la-file-is-totaly-useless-for-python-bindings-and-c.patch
@@ -0,0 +1,34 @@
+From 3c847af770b51ef618e1e636e157e7beccaf046e Mon Sep 17 00:00:00 2001
+From: Tomas Chvatal <scarabeus@gentoo.org>
+Date: Sun, 3 Jan 2010 22:20:50 +0100
+Subject: [PATCH] .la file is totaly useless for python bindings and could even make issues with crosscompilation, thus remove.
+
+---
+ src/Makefile.am |   11 -----------
+ 1 files changed, 0 insertions(+), 11 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index dc8fbae..2ba4c55 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -7,17 +7,6 @@ EXTENSION_XML = xproto.xml \
+ 
+ pkgpythondir = $(pyexecdir)/xcb
+ 
+-pkgpython_LTLIBRARIES = xcb.la
+-
+-xcb_la_LIBADD = $(LIBXCB_LIBS)
+-xcb_la_CPPFLAGS = -I$(PYTHON_INCLUDE)
+-xcb_la_CFLAGS = -g $(CWARNFLAGS)
+-xcb_la_LDFLAGS = -module
+-xcb_la_SOURCES = conn.c constant.c cookie.c error.c event.c except.c \
+-		 ext.c extkey.c iter.c list.c module.c protobj.c \
+-		 reply.c request.c response.c struct.c union.c void.c \
+-		 py_client.py
+-
+ noinst_HEADERS = conn.h constant.h cookie.h error.h event.h except.h \
+ 		 ext.h extkey.h iter.h list.h module.h protobj.h \
+ 		 reply.h request.h response.h struct.h union.h void.h
+-- 
+1.6.6
+
diff --git a/x11-libs/xpyb/xpyb-1.0.ebuild b/x11-libs/xpyb/xpyb-1.0.ebuild
deleted file mode 100644
index 16b0bba19461..000000000000
--- a/x11-libs/xpyb/xpyb-1.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xpyb/xpyb-1.0.ebuild,v 1.3 2009/12/14 11:15:52 remi Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="XCB-based Python bindings for the X Window System"
-HOMEPAGE="http://xcb.freedesktop.org/"
-SRC_URI="http://xcb.freedesktop.org/dist/${P}.tar.bz2"
-KEYWORDS="~amd64 ~x86"
-IUSE="selinux"
-RDEPEND=">=x11-libs/libxcb-1.1
-	>=dev-lang/python-2.5"
-DEPEND="${RDEPEND}
-	>=x11-proto/xcb-proto-1.2"
-DOCS="NEWS README"
-
-pkg_setup() {
-	CONFIGURE_OPTIONS="$(use_enable selinux xselinux)"
-}
diff --git a/x11-libs/xpyb/xpyb-1.1.ebuild b/x11-libs/xpyb/xpyb-1.2.ebuild
index c221961648f3..3290238b3a02 100644
--- a/x11-libs/xpyb/xpyb-1.1.ebuild
+++ b/x11-libs/xpyb/xpyb-1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xpyb/xpyb-1.1.ebuild,v 1.1 2009/09/29 11:24:31 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xpyb/xpyb-1.2.ebuild,v 1.1 2010/01/03 21:32:55 scarabeus Exp $
 
 inherit x-modular
 
@@ -19,6 +19,14 @@ DEPEND="${RDEPEND}
 
 DOCS="NEWS README"
 
+PATCHES=( "${FILESDIR}/0001-.la-file-is-totaly-useless-for-python-bindings-and-c.patch" )
+
 pkg_setup() {
 	CONFIGURE_OPTIONS="$(use_enable selinux xselinux)"
 }
+
+src_unpack() {
+	x-modular_src_unpack
+
+	eautoreconf
+}