Version bump. Drop old. Fix bug #299517

(Portage version: 2.2_rc61/cvs/Linux x86_64)

4 files changed, 53 insertions, 27 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/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
+}