From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.77) (envelope-from ) id 1SqeFm-0001AF-Ix for garchives@archives.gentoo.org; Mon, 16 Jul 2012 05:53:54 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A7E44E0466; Mon, 16 Jul 2012 05:53:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 68FA5E0466 for ; Mon, 16 Jul 2012 05:53:46 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8D94A1B4007 for ; Mon, 16 Jul 2012 05:53:45 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 41D81E543C for ; Mon, 16 Jul 2012 05:53:41 +0000 (UTC) From: "Alexandre Restovtsev" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Restovtsev" Message-ID: <1342417926.3e6acce8ce4ddf8f32798e44c9b2a84d9c177b40.tetromino@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: dev-libs/glib/files/, dev-libs/glib/ X-VCS-Repository: proj/gnome X-VCS-Files: dev-libs/glib/files/glib-2.32.4-bashcomp.patch dev-libs/glib/glib-2.33.3.ebuild dev-libs/glib/glib-9999.ebuild X-VCS-Directories: dev-libs/glib/files/ dev-libs/glib/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: 3e6acce8ce4ddf8f32798e44c9b2a84d9c177b40 X-VCS-Branch: master Date: Mon, 16 Jul 2012 05:53:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: b3849912-a773-4f87-b63f-0b50afbec4c8 X-Archives-Hash: 780b6a1616a0e7025db2cb4549bbbb25 commit: 3e6acce8ce4ddf8f32798e44c9b2a84d9c177b40 Author: Alexandre Rostovtsev gentoo org> AuthorDate: Mon Jul 16 05:52:06 2012 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Mon Jul 16 05:52:06 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D3e6acce8 dev-libs/glib: sync with gx86 for bashcomp Install bash completion in the directory where our "eselect bashcomp" expects to find it. --- dev-libs/glib/files/glib-2.32.4-bashcomp.patch | 27 ++++++++++++++++++= ++++++ dev-libs/glib/glib-2.33.3.ebuild | 5 +++- dev-libs/glib/glib-9999.ebuild | 5 +++- 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dev-libs/glib/files/glib-2.32.4-bashcomp.patch b/dev-libs/gl= ib/files/glib-2.32.4-bashcomp.patch new file mode 100644 index 0000000..33abffc --- /dev/null +++ b/dev-libs/glib/files/glib-2.32.4-bashcomp.patch @@ -0,0 +1,27 @@ +From 6d032421b4871105e1f37bb75a5ec7b012f19f61 Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev +Date: Sun, 15 Jul 2012 22:30:07 -0400 +Subject: [PATCH] gio: use /usr/share/bash-completion for bashcomp + +In Gentoo, we use /usr/share/bash-completion, not +/usr/share/bash-completion/completions. +--- + gio/Makefile.am | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/gio/Makefile.am b/gio/Makefile.am +index 704367c..bee9dc6 100644 +--- a/gio/Makefile.am ++++ b/gio/Makefile.am +@@ -715,7 +715,7 @@ gdbus_LDADD =3D libgio-2.0.la \ + $(top_builddir)/glib/libglib-2.0.la \ + $(top_builddir)/gobject/libgobject-2.0.la +=20 +-completiondir =3D $(datadir)/bash-completion/completions ++completiondir =3D $(datadir)/bash-completion + completion_DATA =3D \ + completion/gdbus \ + completion/gsettings \ +--=20 +1.7.8.6 + diff --git a/dev-libs/glib/glib-2.33.3.ebuild b/dev-libs/glib/glib-2.33.3= .ebuild index 7fe4fca..2c0ccf1 100644 --- a/dev-libs/glib/glib-2.33.3.ebuild +++ b/dev-libs/glib/glib-2.33.3.ebuild @@ -22,7 +22,7 @@ IUSE=3D"debug doc fam kernel_linux selinux static-libs = systemtap test utils xattr" if [[ ${PV} =3D 9999 ]]; then KEYWORDS=3D"" else - KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s39= 0 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-linux" + KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s39= 0 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-lin= ux" fi =20 RDEPEND=3D"virtual/libiconv @@ -131,6 +131,9 @@ src_prepare() { # gdbus-codegen is a separate package epatch "${FILESDIR}/${PN}-2.31.x-external-gdbus-codegen.patch" =20 + # bashcomp goes in /usr/share/bash-completion + epatch "${FILESDIR}/${PN}-2.32.4-bashcomp.patch" + # https://bugzilla.gnome.org/show_bug.cgi?id=3D679306 epatch "${FILESDIR}/${PN}-2.33.x-testsuite-skip-thread4.patch" # https://bugzilla.gnome.org/show_bug.cgi?id=3D679308 diff --git a/dev-libs/glib/glib-9999.ebuild b/dev-libs/glib/glib-9999.ebu= ild index ca821e8..c33dc93 100644 --- a/dev-libs/glib/glib-9999.ebuild +++ b/dev-libs/glib/glib-9999.ebuild @@ -22,7 +22,7 @@ IUSE=3D"debug doc fam kernel_linux selinux static-libs = systemtap test utils xattr" if [[ ${PV} =3D 9999 ]]; then KEYWORDS=3D"" else - KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s39= 0 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-linux" + KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s39= 0 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-lin= ux" fi =20 RDEPEND=3D"virtual/libiconv @@ -131,6 +131,9 @@ src_prepare() { # gdbus-codegen is a separate package epatch "${FILESDIR}/${PN}-2.31.x-external-gdbus-codegen.patch" =20 + # bashcomp goes in /usr/share/bash-completion + epatch "${FILESDIR}/${PN}-2.32.4-bashcomp.patch" + # disable pyc compiling use test && python_clean_py-compile_files =20