[gentoo-commits] repo/gentoo:master commit in: x11-libs/xpyb/, x11-libs/xpyb/files/

2018-05-20 Thread Matt Turner
commit: 04edc646d534459e7f8bd7206ae47f316c0d8241
Author: Matt Turner  gentoo  org>
AuthorDate: Sun May 20 16:03:01 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun May 20 16:03:01 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04edc646

x11-libs/xpyb: Remove

Bug: https://bugs.gentoo.org/651300

 x11-libs/xpyb/Manifest |  1 -
 x11-libs/xpyb/files/xpyb-1.3.1-xcbproto-1.13.patch | 13 --
 x11-libs/xpyb/files/xpyb-1.3.1-xcbproto-1.9.patch  | 11 -
 x11-libs/xpyb/files/xpyb-python.patch  | 12 --
 x11-libs/xpyb/metadata.xml |  8 
 x11-libs/xpyb/xpyb-1.3.1-r5.ebuild | 50 --
 6 files changed, 95 deletions(-)

diff --git a/x11-libs/xpyb/Manifest b/x11-libs/xpyb/Manifest
deleted file mode 100644
index 24d7f593bc7..000
--- a/x11-libs/xpyb/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST xpyb-1.3.1.tar.bz2 273962 BLAKE2B 
931502b14a6fcd41a5a72124895c5e1c2215c74a4baa20778e39611f51ad38e78d7c37859a45c5e7a7e4754aa612bcd01d7362d96bf3c77751c6025f41f4ec6d
 SHA512 
f3020f9b9d27ae522408d22cbdb14c9eb3d4acbc911e6f8fac425323c3f99233f773c3c4e027aa3812dec11b832cf0df8a38f71d21b0c3a1918eea6efe36c090

diff --git a/x11-libs/xpyb/files/xpyb-1.3.1-xcbproto-1.13.patch 
b/x11-libs/xpyb/files/xpyb-1.3.1-xcbproto-1.13.patch
deleted file mode 100644
index 9cb901c9727..000
--- a/x11-libs/xpyb/files/xpyb-1.3.1-xcbproto-1.13.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur xpyb-1.3.1/src/py_client.py xpyb-1.3.1/src/py_client.py
 xpyb-1.3.1/src/py_client.py2012-03-24 01:24:40.0 +0400
-+++ xpyb-1.3.1/src/py_client.py2018-03-08 10:13:48.342758718 +0300
-@@ -585,7 +585,8 @@
-   'union'   : py_union,
-   'request' : py_request,
-   'event'   : py_event,
--  'error'   : py_error
-+  'error'   : py_error,
-+  'eventstruct' : lambda *a, **k: None
-   }
- 
- # Boilerplate below this point

diff --git a/x11-libs/xpyb/files/xpyb-1.3.1-xcbproto-1.9.patch 
b/x11-libs/xpyb/files/xpyb-1.3.1-xcbproto-1.9.patch
deleted file mode 100644
index 1196741b3cb..000
--- a/x11-libs/xpyb/files/xpyb-1.3.1-xcbproto-1.9.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ruN xpyb-1.3.1_ORIG/src/py_client.py xpyb-1.3.1/src/py_client.py
 xpyb-1.3.1_ORIG/src/py_client.py   2013-11-17 12:57:05.157530931 +0100
-+++ xpyb-1.3.1/src/py_client.py2013-11-17 12:57:52.221530100 +0100
-@@ -19,6 +19,7 @@
-'INT8':   'b', 'int8_t':  'b',
-'INT16':  'h', 'int16_t': 'h',
-'INT32':  'i', 'int32_t': 'i',
-+   'INT64':  'i', 'int64_t': 'i',
-'BYTE': 'B',
-'BOOL': 'B',
-'char': 'b',

diff --git a/x11-libs/xpyb/files/xpyb-python.patch 
b/x11-libs/xpyb/files/xpyb-python.patch
deleted file mode 100644
index 4d5d9ac7295..000
--- a/x11-libs/xpyb/files/xpyb-python.patch
+++ /dev/null
@@ -1,12 +0,0 @@
 xpyb-1.3.1/configure.ac.orig   2013-05-21 19:01:51.054962821 +0400
-+++ xpyb-1.3.1/configure.ac2013-05-21 19:05:22.342961464 +0400
-@@ -38,7 +38,8 @@
- 
- # Find the xcbgen Python package
- AC_MSG_CHECKING([for xcb-proto python dir])
--XCBPROTO_XCBPYTHONDIR=`$PKG_CONFIG --variable=pythondir xcb-proto`
-+XCBPROTO_XCBPYTHONDIR=`$PYTHON -c 'import xcbgen; from os.path import 
dirname, abspath, join; \
-+   print abspath(join(dirname(xcbgen.[__file__]), ".."))'`
- AC_MSG_RESULT($XCBPROTO_XCBPYTHONDIR)
- AC_SUBST(XCBPROTO_XCBPYTHONDIR)
- 

diff --git a/x11-libs/xpyb/metadata.xml b/x11-libs/xpyb/metadata.xml
deleted file mode 100644
index e943b72b8a4..000
--- a/x11-libs/xpyb/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd;>
-
-
-   x...@gentoo.org
-   X11
-
-

diff --git a/x11-libs/xpyb/xpyb-1.3.1-r5.ebuild 
b/x11-libs/xpyb/xpyb-1.3.1-r5.ebuild
deleted file mode 100644
index 5e162838c60..000
--- a/x11-libs/xpyb/xpyb-1.3.1-r5.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-AUTOTOOLS_AUTORECONF=1
-
-inherit flag-o-matic xorg-2 python-r1
-
-#EGIT_REPO_URI="https://anongit.freedesktop.org/git/xcb/xpyb.git;
-SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2;
-DESCRIPTION="XCB-based Python bindings for the X Window System"
-HOMEPAGE="https://xcb.freedesktop.org/;
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="selinux"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND=">=x11-libs/libxcb-1.7
-   ${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-   >=x11-base/xcb-proto-1.7.1[${PYTHON_USEDEP}]"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-python.patch
-   "${FILESDIR}"/${PN}-1.3.1-xcbproto-1.9.patch
-   

[gentoo-commits] repo/gentoo:master commit in: x11-libs/xpyb/, x11-libs/xpyb/files/

2018-03-07 Thread Maxim Koltsov
commit: 3c25eb2147f4ea84a1bd9e608b6d61e6ca9f4e87
Author: Maxim Koltsov  gentoo  org>
AuthorDate: Thu Mar  8 07:22:02 2018 +
Commit: Maxim Koltsov  gentoo  org>
CommitDate: Thu Mar  8 07:22:02 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c25eb21

x11-libs/xpyb: patch for xcb-proto-1.13

Bug: https://bugs.gentoo.org/649876
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 x11-libs/xpyb/files/xpyb-1.3.1-xcbproto-1.13.patch | 13 ++
 x11-libs/xpyb/xpyb-1.3.1-r4.ebuild | 50 ++
 2 files changed, 63 insertions(+)

diff --git a/x11-libs/xpyb/files/xpyb-1.3.1-xcbproto-1.13.patch 
b/x11-libs/xpyb/files/xpyb-1.3.1-xcbproto-1.13.patch
new file mode 100644
index 000..9cb901c9727
--- /dev/null
+++ b/x11-libs/xpyb/files/xpyb-1.3.1-xcbproto-1.13.patch
@@ -0,0 +1,13 @@
+diff -ur xpyb-1.3.1/src/py_client.py xpyb-1.3.1/src/py_client.py
+--- xpyb-1.3.1/src/py_client.py2012-03-24 01:24:40.0 +0400
 xpyb-1.3.1/src/py_client.py2018-03-08 10:13:48.342758718 +0300
+@@ -585,7 +585,8 @@
+   'union'   : py_union,
+   'request' : py_request,
+   'event'   : py_event,
+-  'error'   : py_error
++  'error'   : py_error,
++  'eventstruct' : lambda *a, **k: None
+   }
+ 
+ # Boilerplate below this point

diff --git a/x11-libs/xpyb/xpyb-1.3.1-r4.ebuild 
b/x11-libs/xpyb/xpyb-1.3.1-r4.ebuild
new file mode 100644
index 000..1e7d210bc6a
--- /dev/null
+++ b/x11-libs/xpyb/xpyb-1.3.1-r4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+AUTOTOOLS_AUTORECONF=1
+
+inherit flag-o-matic xorg-2 python-r1
+
+#EGIT_REPO_URI="https://anongit.freedesktop.org/git/xcb/xpyb.git;
+SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2;
+DESCRIPTION="XCB-based Python bindings for the X Window System"
+HOMEPAGE="https://xcb.freedesktop.org/;
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="selinux"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND=">=x11-libs/libxcb-1.7
+   >=x11-proto/xcb-proto-1.7.1[${PYTHON_USEDEP}]
+   ${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-python.patch
+   "${FILESDIR}"/${PN}-1.3.1-xcbproto-1.9.patch
+   "${FILESDIR}"/${PN}-1.3.1-xcbproto-1.13.patch
+)
+DOCS=( NEWS README )
+
+pkg_setup() {
+   xorg-2_pkg_setup
+   XORG_CONFIGURE_OPTIONS=(
+   $(use_enable selinux)
+   )
+}
+
+src_configure() {
+   append-cflags -fno-strict-aliasing
+   python_foreach_impl xorg-2_src_configure
+}
+
+src_compile() {
+   python_foreach_impl xorg-2_src_compile
+}
+
+src_install() {
+   python_foreach_impl xorg-2_src_install
+}