[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3-gaps/

2019-10-02 Thread Agostino Sarubbo
commit: 6b527a9f9b47633770452c0615f9abb599882032
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Oct  2 19:06:26 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Oct  2 19:06:26 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b527a9f

x11-wm/i3-gaps: amd64 stable wrt bug #695790

Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 x11-wm/i3-gaps/i3-gaps-4.16.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/i3-gaps/i3-gaps-4.16.1-r1.ebuild 
b/x11-wm/i3-gaps/i3-gaps-4.16.1-r1.ebuild
index ae2ef5483cb..ed9539d8918 100644
--- a/x11-wm/i3-gaps/i3-gaps-4.16.1-r1.ebuild
+++ b/x11-wm/i3-gaps/i3-gaps-4.16.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Airblader/i3/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3-gaps/

2019-10-02 Thread Agostino Sarubbo
commit: a6f6decdf0a2c7b9842db3354a40608dd2e79601
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Oct  2 18:52:07 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Oct  2 18:53:46 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6f6decd

x11-wm/i3-gaps: x86 stable wrt bug #695790

Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 x11-wm/i3-gaps/i3-gaps-4.16.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/i3-gaps/i3-gaps-4.16.1-r1.ebuild 
b/x11-wm/i3-gaps/i3-gaps-4.16.1-r1.ebuild
index 0f5113ed0c6..ae2ef5483cb 100644
--- a/x11-wm/i3-gaps/i3-gaps-4.16.1-r1.ebuild
+++ b/x11-wm/i3-gaps/i3-gaps-4.16.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Airblader/i3/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="doc"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3-gaps/, x11-wm/i3-gaps/files/

2019-09-28 Thread Johannes Huber
commit: be3b270d9e1ae89d12875793595eab3ff82eb37d
Author: Johannes Huber  gentoo  org>
AuthorDate: Sat Sep 28 10:45:16 2019 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sat Sep 28 10:45:53 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be3b270d

x11-wm/i3-gaps: Version bump 4.17.1

Reported-by: Marcin Kowalski  autograf.pl>
Closes: https://bugs.gentoo.org/693822
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Johannes Huber  gentoo.org>

 x11-wm/i3-gaps/Manifest  |  1 +
 x11-wm/i3-gaps/files/i3-gaps-4.17-musl.patch | 71 +++
 x11-wm/i3-gaps/i3-gaps-4.17.1.ebuild | 87 
 3 files changed, 159 insertions(+)

diff --git a/x11-wm/i3-gaps/Manifest b/x11-wm/i3-gaps/Manifest
index 4d354175686..652f73bdb1d 100644
--- a/x11-wm/i3-gaps/Manifest
+++ b/x11-wm/i3-gaps/Manifest
@@ -1 +1,2 @@
 DIST i3-gaps-4.16.1.tar.gz 3983420 BLAKE2B 
f0d5a85b06ce33e1cc177af6da29f9cdf42ed754bb767aa9eaa5ab52f3b9f4f688d251f2a16fb222fc8cf5052e79859891c4185b1325b2ef6c1a813aa220468c
 SHA512 
904c2f63c6a35573f13fd216625c1349ac71de70ae8f0440667c9d76048cdaf30a398ab358f2366d5f46502d87e801713b625cb509a05f39dbca1371d2b8d0e9
+DIST i3-gaps-4.17.1.tar.gz 3991747 BLAKE2B 
e5ff8293abf41ffbd15c35590a0594861d7c8b70c0f42886ef7f15fb34b8da57a92cf9bcae76576e7db6db9bacc2356722e5653b1cf35b8446716f8845468b4b
 SHA512 
31e47487f6f662f27b2642925f4ddfc553f1fd075e612d0d2661db723897b12eeae0a2bcefa8a43e7f1d4c15aecd3a63e37c8f7e1f9fc96567faa380ebff

diff --git a/x11-wm/i3-gaps/files/i3-gaps-4.17-musl.patch 
b/x11-wm/i3-gaps/files/i3-gaps-4.17-musl.patch
new file mode 100644
index 000..d4f9113e6b1
--- /dev/null
+++ b/x11-wm/i3-gaps/files/i3-gaps-4.17-musl.patch
@@ -0,0 +1,71 @@
+--- a/i3bar/src/main.c
 b/i3bar/src/main.c
+@@ -48,14 +48,20 @@ void debuglog(char *fmt, ...) {
+  *
+  */
+ static char *expand_path(char *path) {
+-static glob_t globbuf;
+-if (glob(path, GLOB_NOCHECK | GLOB_TILDE, NULL, ) < 0) {
+-ELOG("glob() failed\n");
+-exit(EXIT_FAILURE);
++char *home, *expanded;
++
++if (strncmp(path, "~/", 2) == 0) {
++home = getenv("HOME");
++if (home != NULL) {
++/* new length: sum - 1 (omit '~') + 1 (for '\0') */
++expanded = scalloc(strlen(home)+strlen(path), 1);
++strcpy(expanded, home);
++strcat(expanded, path+1);
++return expanded;
++}
+ }
+-char *result = sstrdup(globbuf.gl_pathc > 0 ? globbuf.gl_pathv[0] : path);
+-globfree();
+-return result;
++
++return sstrdup(path);
+ }
+
+ void print_usage(char *elf_name) {
+--- a/libi3/resolve_tilde.c
 b/libi3/resolve_tilde.c
+@@ -19,28 +19,18 @@
+  *
+  */
+ char *resolve_tilde(const char *path) {
+-static glob_t globbuf;
+-char *head, *tail, *result;
++char *home, *expanded;
+
+-tail = strchr(path, '/');
+-head = sstrndup(path, tail ? (size_t)(tail - path) : strlen(path));
+-
+-int res = glob(head, GLOB_TILDE, NULL, );
+-free(head);
+-/* no match, or many wildcard matches are bad */
+-if (res == GLOB_NOMATCH || globbuf.gl_pathc != 1)
+-result = sstrdup(path);
+-else if (res != 0) {
+-err(EXIT_FAILURE, "glob() failed");
+-} else {
+-head = globbuf.gl_pathv[0];
+-result = scalloc(strlen(head) + (tail ? strlen(tail) : 0) + 1, 1);
+-strcpy(result, head);
+-if (tail) {
+-strcat(result, tail);
++if (strncmp(path, "~/", 2) == 0) {
++home = getenv("HOME");
++if (home != NULL) {
++/* new length: sum - 1 (omit '~') + 1 (for '\0') */
++expanded = scalloc(strlen(home)+strlen(path), 1);
++strcpy(expanded, home);
++strcat(expanded, path+1);
++return expanded;
+ }
+ }
+-globfree();
+
+-return result;
++return sstrdup(path);
+ }

diff --git a/x11-wm/i3-gaps/i3-gaps-4.17.1.ebuild 
b/x11-wm/i3-gaps/i3-gaps-4.17.1.ebuild
new file mode 100644
index 000..0f5113ed0c6
--- /dev/null
+++ b/x11-wm/i3-gaps/i3-gaps-4.17.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools out-of-source
+
+DESCRIPTION="i3 fork with gaps and some more features"
+HOMEPAGE="https://github.com/Airblader/i3;
+SRC_URI="https://github.com/Airblader/i3/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND="
+   dev-libs/glib:2
+   dev-libs/libev
+   dev-libs/libpcre
+   dev-libs/yajl
+   x11-libs/cairo[X,xcb]
+   x11-libs/libxcb[xkb]
+   x11-libs/libxkbcommon[X]
+   x11-libs/pango[X]
+   x11-libs/startup-notification
+   x11-libs/xcb-util
+   x11-libs/xcb-util-cursor
+   x11-libs/xcb-util-keysyms
+   x11-libs/xcb-util-wm
+   x11-libs/xcb-util-xrm
+"

[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/

2019-09-08 Thread Lars Wendler
commit: 92e98d83dc8a147c44036fc2caee6d523f2a9422
Author: Nelo-T. Wallus  wallus  de>
AuthorDate: Sun Sep  8 07:37:24 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sun Sep  8 08:03:03 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92e98d83

x11-wm/i3: Bump to v4.17.1

Package-Manager: Portage-2.3.75, Repoman-2.3.12
Signed-off-by: Nelo-T. Wallus  wallus.de>
Closes: https://github.com/gentoo/gentoo/pull/12885
Signed-off-by: Lars Wendler  gentoo.org>

 x11-wm/i3/Manifest |   1 +
 x11-wm/i3/i3-4.17.1.ebuild | 110 +
 2 files changed, 111 insertions(+)

diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index c2509315514..29255354a40 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -2,3 +2,4 @@ DIST i3-4.14.tar.gz 3936748 BLAKE2B 
42678130be56bc695e5700e978ddbd34bfdaeda7a652
 DIST i3-4.15.tar.bz2 1196263 BLAKE2B 
36f20327202957dba30aface91af4d2c6261979e726584712a508a11cb4a612d812e771dc9f28ec4cfcbf3ebc9d92c72f5e940048516cca0f185eab20f95ae32
 SHA512 
60ab61b7e380342126bea12fb4371f98fcf18f6435f79a9519d3f59cfabdb170634366036e1aa20c5592da0832b03140ad1f0c72bad3cfaace0b7c57ad01dfc4
 DIST i3-4.16.1.tar.bz2 1211532 BLAKE2B 
64a6996c0b89516069b58bf1cba92908a7f61ab04d66659b612b27411eb92fa9d49a7214eccdba33e7c33605b5f9247f69c1f0e23de629552edf113ab7520747
 SHA512 
3e328f8c7216697c5e484ca854605350f78844e24cc6cfb9c10e71368c2c0457387a14f819abdf8be2370d437889297f452fbf63f3924766ca81c157ab27e1b0
 DIST i3-4.16.tar.bz2 1213251 BLAKE2B 
a65d15278a83bac9903a611628ea53c64cd554ab9fff2a8864e649fd962858b2f3e77fe69d0dc70affc93dc69b3cbbd7b3ee670a2af9d697e28e9e4ea3323f67
 SHA512 
99abd15349ee8e61c084b3664ef3a189c92ea07812ac59eb6a5441df7cebea8211be52204e39bddcc33d8c714447fddbbe2c5c8a25b756a96e2dc6732526cbf8
+DIST i3-4.17.1.tar.bz2 1218418 BLAKE2B 
eb798eee2b618691ceb47b72c08fe09b09e2913c17fe667fab95426069c86497bff67278bea5fc97fdf90ebdfc6574e68cad36b21036a63d053edced1edf8592
 SHA512 
af397dc1768ea6530e4b2ce8ef21b20ecff8ab9eebf380df224456173eea4c3bacf28b55c8efcdc70f76f0d66543c163564a94cfd66028221ace481fa3c2913f

diff --git a/x11-wm/i3/i3-4.17.1.ebuild b/x11-wm/i3/i3-4.17.1.ebuild
new file mode 100644
index 000..70b10d43e8f
--- /dev/null
+++ b/x11-wm/i3/i3-4.17.1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools out-of-source virtualx
+
+DESCRIPTION="An improved dynamic tiling window manager"
+HOMEPAGE="https://i3wm.org/;
+SRC_URI="https://i3wm.org/downloads/${P}.tar.bz2;
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc debug test"
+
+CDEPEND="dev-libs/libev
+   dev-libs/libpcre
+   >=dev-libs/yajl-2.0.3
+   x11-libs/libxcb[xkb]
+   x11-libs/libxkbcommon[X]
+   x11-libs/startup-notification
+   x11-libs/xcb-util
+   x11-libs/xcb-util-cursor
+   x11-libs/xcb-util-keysyms
+   x11-libs/xcb-util-wm
+   x11-libs/xcb-util-xrm
+   x11-misc/xkeyboard-config
+   >=x11-libs/cairo-1.14.4[X,xcb]
+   >=x11-libs/pango-1.30.0[X]"
+DEPEND="${CDEPEND}
+   test? (
+   dev-perl/AnyEvent
+   >=dev-perl/X11-XCB-0.120.0
+   dev-perl/Inline
+   dev-perl/Inline-C
+   dev-perl/IPC-Run
+   dev-perl/ExtUtils-PkgConfig
+   dev-perl/local-lib
+   >=virtual/perl-Test-Simple-0.940.0
+   x11-base/xorg-server[xephyr]
+   )"
+RDEPEND="${CDEPEND}
+   dev-lang/perl
+   dev-perl/AnyEvent-I3
+   dev-perl/JSON-XS"
+BDEPEND="virtual/pkgconfig"
+
+# Test without debug will apply optimization levels, which results
+# in type-punned pointers - which in turn causes test failures.
+REQUIRED_USE="test? ( debug )"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-4.16-musl-GLOB_TILDE.patch"
+)
+
+# https://github.com/i3/i3/issues/3013
+RESTRICT="test"
+
+src_prepare() {
+   default
+
+   cat <<- EOF > "${T}"/i3wm
+   #!/bin/sh
+   exec /usr/bin/i3
+   EOF
+
+   eautoreconf
+}
+
+my_src_configure() {
+   local myeconfargs=(
+   $(use_enable debug)
+   )
+   econf "${myeconfargs[@]}"
+}
+
+my_src_test() {
+   emake \
+   test.commands_parser \
+   test.config_parser \
+   test.inject_randr15
+
+   virtx perl \
+   -I "${S}/testcases/lib" \
+   -I "${BUILD_DIR}/testcases/lib" \
+   testcases/complete-run.pl
+}
+
+my_src_install_all() {
+   doman man/*.1
+
+   einstalldocs
+   use doc && dodoc -r docs "RELEASE-NOTES-${PV}"
+
+   exeinto /etc/X11/Sessions
+   doexe "${T}/i3wm"
+}
+
+pkg_postinst() {
+   # Only show the elog information on a new install
+   if [[ ! ${REPLACING_VERSIONS} ]]; then
+   elog "There are several packages that you may find useful with 
${PN} and"
+   elog 

[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3-gaps/

2019-06-22 Thread Johannes Huber
commit: fce36abed876c5892a7d9195048c3acbacdf4dea
Author: Johannes Huber  gentoo  org>
AuthorDate: Sat Jun 22 10:52:57 2019 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sat Jun 22 11:02:53 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fce36abe

x11-wm/i3-gaps: Install man pages

Closes: https://bugs.gentoo.org/687280
Package-Manager: Portage-2.3.67, Repoman-2.3.15
Signed-off-by: Johannes Huber  gentoo.org>

 x11-wm/i3-gaps/i3-gaps-4.16.1-r1.ebuild | 87 +
 1 file changed, 87 insertions(+)

diff --git a/x11-wm/i3-gaps/i3-gaps-4.16.1-r1.ebuild 
b/x11-wm/i3-gaps/i3-gaps-4.16.1-r1.ebuild
new file mode 100644
index 000..2d8654ca3aa
--- /dev/null
+++ b/x11-wm/i3-gaps/i3-gaps-4.16.1-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools out-of-source
+
+DESCRIPTION="i3 fork with gaps and some more features"
+HOMEPAGE="https://github.com/Airblader/i3;
+SRC_URI="https://github.com/Airblader/i3/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+   dev-libs/glib:2
+   dev-libs/libev
+   dev-libs/libpcre
+   dev-libs/yajl
+   x11-libs/cairo[X,xcb]
+   x11-libs/libxcb[xkb]
+   x11-libs/libxkbcommon[X]
+   x11-libs/pango[X]
+   x11-libs/startup-notification
+   x11-libs/xcb-util
+   x11-libs/xcb-util-cursor
+   x11-libs/xcb-util-keysyms
+   x11-libs/xcb-util-wm
+   x11-libs/xcb-util-xrm
+"
+BDEPEND="
+   app-text/asciidoc
+   app-text/xmlto
+   dev-lang/perl
+   virtual/pkgconfig
+"
+RDEPEND="${DEPEND}
+   dev-lang/perl
+   dev-perl/AnyEvent-I3
+   dev-perl/JSON-XS
+   !x11-wm/i3
+"
+
+S=${WORKDIR}/i3-${PV}
+
+DOCS=( RELEASE-NOTES-$(ver_cut 1-3) )
+
+PATCHES=( "${FILESDIR}/${PN}-$(ver_cut 1-2)-musl.patch" )
+
+src_prepare() {
+   default
+   eautoreconf
+   cat <<- EOF > "${T}"/i3wm
+   #!/bin/sh
+   exec /usr/bin/i3
+   EOF
+}
+
+my_src_configure() {
+   # disable sanitizer: otherwise injects -O0 -g
+   local myeconfargs=(
+   --enable-debug=no
+   --enable-mans
+   --disable-docs
+   --disable-sanitizers
+   )
+   econf "${myeconfargs[@]}"
+}
+
+my_src_install_all() {
+   doman "${BUILD_DIR}"/man/*.1
+   einstalldocs
+
+   exeinto /etc/X11/Sessions
+   doexe "${T}"/i3wm
+}
+
+pkg_postinst() {
+   einfo "There are several packages that you may find useful with ${PN} 
and"
+   einfo "their usage is suggested by the upstream maintainers, namely:"
+   einfo "  x11-misc/dmenu"
+   einfo "  x11-misc/i3lock"
+   einfo "  x11-misc/i3status"
+   einfo "Please refer to their description for additional info."
+}



[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3-gaps/

2019-06-22 Thread Johannes Huber
commit: 11a263049a58b694328ef427b9ba648c31f25ef0
Author: Johannes Huber  gentoo  org>
AuthorDate: Sat Jun 22 11:02:31 2019 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sat Jun 22 11:02:56 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11a26304

x11-wm/i3-gaps: Install documentation

Package-Manager: Portage-2.3.67, Repoman-2.3.15
Signed-off-by: Johannes Huber  gentoo.org>

 x11-wm/i3-gaps/i3-gaps-4.16.1-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-wm/i3-gaps/i3-gaps-4.16.1-r1.ebuild 
b/x11-wm/i3-gaps/i3-gaps-4.16.1-r1.ebuild
index 2d8654ca3aa..0f5113ed0c6 100644
--- a/x11-wm/i3-gaps/i3-gaps-4.16.1-r1.ebuild
+++ b/x11-wm/i3-gaps/i3-gaps-4.16.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/Airblader/i3/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="doc"
 
 DEPEND="
dev-libs/glib:2
@@ -61,9 +61,9 @@ src_prepare() {
 my_src_configure() {
# disable sanitizer: otherwise injects -O0 -g
local myeconfargs=(
+   $(use_enable doc docs)
--enable-debug=no
--enable-mans
-   --disable-docs
--disable-sanitizers
)
econf "${myeconfargs[@]}"



[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3-gaps/files/, x11-wm/i3-gaps/

2019-05-14 Thread Johannes Huber
commit: af6ac2bd830d76d871559261adb215f06cec3218
Author: Johannes Huber  gentoo  org>
AuthorDate: Tue May 14 16:56:07 2019 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Tue May 14 16:56:07 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af6ac2bd

x11-wm/i3-gaps: Remove 4.15.0.1

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Johannes Huber  gentoo.org>

 x11-wm/i3-gaps/Manifest  |  1 -
 x11-wm/i3-gaps/files/i3-gaps-4.15-musl.patch | 73 ---
 x11-wm/i3-gaps/i3-gaps-4.15.0.1.ebuild   | 87 
 3 files changed, 161 deletions(-)

diff --git a/x11-wm/i3-gaps/Manifest b/x11-wm/i3-gaps/Manifest
index b401a04fccb..4d354175686 100644
--- a/x11-wm/i3-gaps/Manifest
+++ b/x11-wm/i3-gaps/Manifest
@@ -1,2 +1 @@
-DIST i3-gaps-4.15.0.1.tar.gz 3965631 BLAKE2B 
ea65886c40f377125bafbd80e2d56c1d66a4c5c06d942d645b2cb226323a0903e98aa58b67da9c31c60240b5d99d10ecc20864aeede95a5039ea0ffdff8dcb8b
 SHA512 
76ff860e4ca0edd0e22bdff9ae9b1bc150df2b5bc15b0d7ea7a63d373e8d156a43bd91f8a40c48b4c771603f7de7c18c6d16c53fef582e53f51c53a197fa7a0a
 DIST i3-gaps-4.16.1.tar.gz 3983420 BLAKE2B 
f0d5a85b06ce33e1cc177af6da29f9cdf42ed754bb767aa9eaa5ab52f3b9f4f688d251f2a16fb222fc8cf5052e79859891c4185b1325b2ef6c1a813aa220468c
 SHA512 
904c2f63c6a35573f13fd216625c1349ac71de70ae8f0440667c9d76048cdaf30a398ab358f2366d5f46502d87e801713b625cb509a05f39dbca1371d2b8d0e9

diff --git a/x11-wm/i3-gaps/files/i3-gaps-4.15-musl.patch 
b/x11-wm/i3-gaps/files/i3-gaps-4.15-musl.patch
deleted file mode 100644
index 82ad6195b8e..000
--- a/x11-wm/i3-gaps/files/i3-gaps-4.15-musl.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff -urp i3-4.11/i3bar/src/main.c i3-4.11.new/i3bar/src/main.c
 i3-4.11/i3bar/src/main.c   2015-09-30 07:55:10.0 +0100
-+++ i3-4.11.new/i3bar/src/main.c   2016-02-08 20:03:41.777392482 +
-@@ -45,14 +45,20 @@ void debuglog(char *fmt, ...) {
-  *
-  */
- char *expand_path(char *path) {
--static glob_t globbuf;
--if (glob(path, GLOB_NOCHECK | GLOB_TILDE, NULL, ) < 0) {
--ELOG("glob() failed\n");
--exit(EXIT_FAILURE);
-+char *home, *expanded;
-+
-+if (strncmp(path, "~/", 2) == 0) {
-+home = getenv("HOME");
-+if (home != NULL) {
-+/* new length: sum - 1 (omit '~') + 1 (for '\0') */
-+expanded = scalloc(strlen(home)+strlen(path), 1);
-+strcpy(expanded, home);
-+strcat(expanded, path+1);
-+return expanded;
-+}
- }
--char *result = sstrdup(globbuf.gl_pathc > 0 ? globbuf.gl_pathv[0] : path);
--globfree();
--return result;
-+
-+return sstrdup(path);
- }
- 
- void print_usage(char *elf_name) {
-diff -urp i3-4.11/libi3/resolve_tilde.c i3-4.11.new/libi3/resolve_tilde.c
 i3-4.11/libi3/resolve_tilde.c  2015-09-30 07:55:10.0 +0100
-+++ i3-4.11.new/libi3/resolve_tilde.c  2016-02-08 20:03:47.849230953 +
-@@ -19,27 +19,18 @@
-  *
-  */
- char *resolve_tilde(const char *path) {
--static glob_t globbuf;
--char *head, *tail, *result;
-+char *home, *expanded;
- 
--tail = strchr(path, '/');
--head = sstrndup(path, tail ? (size_t)(tail - path) : strlen(path));
--
--int res = glob(head, GLOB_TILDE, NULL, );
--free(head);
--/* no match, or many wildcard matches are bad */
--if (res == GLOB_NOMATCH || globbuf.gl_pathc != 1)
--result = sstrdup(path);
--else if (res != 0) {
--err(EXIT_FAILURE, "glob() failed");
--} else {
--head = globbuf.gl_pathv[0];
--result = scalloc(strlen(head) + (tail ? strlen(tail) : 0) + 1, 1);
--strncpy(result, head, strlen(head));
--if (tail)
--strncat(result, tail, strlen(tail));
-+if (strncmp(path, "~/", 2) == 0) {
-+home = getenv("HOME");
-+if (home != NULL) {
-+/* new length: sum - 1 (omit '~') + 1 (for '\0') */
-+expanded = scalloc(strlen(home)+strlen(path), 1);
-+strcpy(expanded, home);
-+strcat(expanded, path+1);
-+return expanded;
-+}
- }
--globfree();
- 
--return result;
-+return sstrdup(path);
- }

diff --git a/x11-wm/i3-gaps/i3-gaps-4.15.0.1.ebuild 
b/x11-wm/i3-gaps/i3-gaps-4.15.0.1.ebuild
deleted file mode 100644
index a4357937c21..000
--- a/x11-wm/i3-gaps/i3-gaps-4.15.0.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eapi7-ver
-
-DESCRIPTION="i3 fork with gaps and some more features"
-HOMEPAGE="https://github.com/Airblader/i3;
-SRC_URI="https://github.com/Airblader/i3/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-CDEPEND="
-   dev-libs/glib:2
-   dev-libs/libev
-   dev-libs/libpcre
-   dev-libs/yajl
-   x11-libs/cairo[X,xcb]
-  

[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3-gaps/

2019-05-10 Thread Thomas Deutschmann
commit: 557ec05ee3493668a6ec071d5a06de4d175f1324
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun May  5 20:04:15 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri May 10 13:02:37 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=557ec05e

x11-wm/i3-gaps: x86 stable (bug #684854)

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann  gentoo.org>

 x11-wm/i3-gaps/i3-gaps-4.16.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/i3-gaps/i3-gaps-4.16.1.ebuild 
b/x11-wm/i3-gaps/i3-gaps-4.16.1.ebuild
index 7a503f28a2e..c0e64862217 100644
--- a/x11-wm/i3-gaps/i3-gaps-4.16.1.ebuild
+++ b/x11-wm/i3-gaps/i3-gaps-4.16.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Airblader/i3/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3-gaps/

2019-05-02 Thread Mikle Kolyada
commit: b7e876e2689261b9bf84998630356958e9f795ce
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Thu May  2 18:32:06 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Thu May  2 18:32:06 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7e876e2

x11-wm/i3-gaps: amd64 stable wrt bug #684854

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 x11-wm/i3-gaps/i3-gaps-4.16.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/i3-gaps/i3-gaps-4.16.1.ebuild 
b/x11-wm/i3-gaps/i3-gaps-4.16.1.ebuild
index 8ea48ba30b5..7a503f28a2e 100644
--- a/x11-wm/i3-gaps/i3-gaps-4.16.1.ebuild
+++ b/x11-wm/i3-gaps/i3-gaps-4.16.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Airblader/i3/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3-gaps/

2019-05-01 Thread Johannes Huber
commit: 57723bd1dce00129c31f8bdbd3b1da3b6c07d270
Author: Johannes Huber  gentoo  org>
AuthorDate: Wed May  1 08:07:57 2019 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Wed May  1 08:08:18 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57723bd1

x11-wm/i3-gaps: Remove 4.16

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Johannes Huber  gentoo.org>

 x11-wm/i3-gaps/Manifest|  1 -
 x11-wm/i3-gaps/i3-gaps-4.16.ebuild | 87 --
 2 files changed, 88 deletions(-)

diff --git a/x11-wm/i3-gaps/Manifest b/x11-wm/i3-gaps/Manifest
index 80f416b1cd9..b401a04fccb 100644
--- a/x11-wm/i3-gaps/Manifest
+++ b/x11-wm/i3-gaps/Manifest
@@ -1,3 +1,2 @@
 DIST i3-gaps-4.15.0.1.tar.gz 3965631 BLAKE2B 
ea65886c40f377125bafbd80e2d56c1d66a4c5c06d942d645b2cb226323a0903e98aa58b67da9c31c60240b5d99d10ecc20864aeede95a5039ea0ffdff8dcb8b
 SHA512 
76ff860e4ca0edd0e22bdff9ae9b1bc150df2b5bc15b0d7ea7a63d373e8d156a43bd91f8a40c48b4c771603f7de7c18c6d16c53fef582e53f51c53a197fa7a0a
 DIST i3-gaps-4.16.1.tar.gz 3983420 BLAKE2B 
f0d5a85b06ce33e1cc177af6da29f9cdf42ed754bb767aa9eaa5ab52f3b9f4f688d251f2a16fb222fc8cf5052e79859891c4185b1325b2ef6c1a813aa220468c
 SHA512 
904c2f63c6a35573f13fd216625c1349ac71de70ae8f0440667c9d76048cdaf30a398ab358f2366d5f46502d87e801713b625cb509a05f39dbca1371d2b8d0e9
-DIST i3-gaps-4.16.tar.gz 3985226 BLAKE2B 
da61ab6b476a30a4acab24590cd5ca51f0f51318988890e66530fdd76d99236378d9c678e1e37da99e22e70b0e5e0e5895b8146bd5a93b23957cb1e0178e08b1
 SHA512 
64a392d2b4175e063f0740ee04885156dbd2571262c22df6276e8eaac36765cd03822723208118a1998ff6cbbcd973fb7f6305df9744c477262d5d33b792ee23

diff --git a/x11-wm/i3-gaps/i3-gaps-4.16.ebuild 
b/x11-wm/i3-gaps/i3-gaps-4.16.ebuild
deleted file mode 100644
index d3e62d0fb17..000
--- a/x11-wm/i3-gaps/i3-gaps-4.16.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="i3 fork with gaps and some more features"
-HOMEPAGE="https://github.com/Airblader/i3;
-SRC_URI="https://github.com/Airblader/i3/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-   dev-libs/glib:2
-   dev-libs/libev
-   dev-libs/libpcre
-   dev-libs/yajl
-   x11-libs/cairo[X,xcb]
-   x11-libs/libxcb[xkb]
-   x11-libs/libxkbcommon[X]
-   x11-libs/pango[X]
-   x11-libs/startup-notification
-   x11-libs/xcb-util
-   x11-libs/xcb-util-cursor
-   x11-libs/xcb-util-keysyms
-   x11-libs/xcb-util-wm
-   x11-libs/xcb-util-xrm
-"
-BDEPEND="
-   virtual/pkgconfig
-"
-RDEPEND="${DEPEND}
-   dev-lang/perl
-   dev-perl/AnyEvent-I3
-   dev-perl/JSON-XS
-   !x11-wm/i3
-"
-
-S=${WORKDIR}/i3-${PV}
-
-DOCS=( RELEASE-NOTES-$(ver_cut 1-2) )
-
-PATCHES=( "${FILESDIR}/${PN}-$(ver_cut 1-2)-musl.patch" )
-
-src_prepare() {
-   default
-   sed -e '/AC_PATH_PROG(\[PATH_ASCIIDOC/d' -i configure.ac || die
-   eautoreconf
-   cat <<- EOF > "${T}"/i3wm
-   #!/bin/sh
-   exec /usr/bin/i3
-   EOF
-}
-
-src_configure() {
-   # disable sanitizer: otherwise injects -O0 -g
-   local myeconfargs=(
-   --enable-debug=no
-   --disable-sanitizers
-   )
-   econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-   emake -C "${CBUILD}"
-}
-
-src_install() {
-   emake -C "${CBUILD}" DESTDIR="${D}" install
-   einstalldocs
-
-   exeinto /etc/X11/Sessions
-   doexe "${T}"/i3wm
-}
-
-pkg_postinst() {
-   einfo "There are several packages that you may find useful with ${PN} 
and"
-   einfo "their usage is suggested by the upstream maintainers, namely:"
-   einfo "  x11-misc/dmenu"
-   einfo "  x11-misc/i3lock"
-   einfo "  x11-misc/i3status"
-   einfo "Please refer to their description for additional info."
-}



[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/

2019-03-26 Thread Lars Wendler
commit: f733c76af6f80c66c237d1f905d2b488671d9e6f
Author: Nelo-T. Wallus  wallus  de>
AuthorDate: Wed Mar 20 22:13:18 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Mar 26 08:58:42 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f733c76a

x11-wm/i3: Bump to 4.16.1

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Nelo-T. Wallus  wallus.de>
Closes: https://github.com/gentoo/gentoo/pull/11429
Signed-off-by: Lars Wendler  gentoo.org>

 x11-wm/i3/Manifest |   1 +
 x11-wm/i3/i3-4.16.1.ebuild | 111 +
 2 files changed, 112 insertions(+)

diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index 37fd66cefdd..815dd064801 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -2,4 +2,5 @@ DIST i3-4.13.tar.bz2 1121298 BLAKE2B 
94f3940406d43083c8dc577b4216a32a08ad4c4b58e
 DIST i3-4.14.1.tar.bz2 1173560 BLAKE2B 
96a0e1d75be13098fd530c3970464ce7710063f517c0d538939de6e7c799ab6b3ec005fb50216b1db4ccefd44584c584b263ac359bd9a86be53418d8f8d4beba
 SHA512 
ef628af002947b40e1c88b0e872c6e93d4377a9674a120bd9adc3f323a38570b05124cd3047b5a26659e72070de2d00d83fb93186510c74ad8ddbf4f3df85472
 DIST i3-4.14.tar.gz 3936748 BLAKE2B 
42678130be56bc695e5700e978ddbd34bfdaeda7a65252a05568581d76fe613e80e710f3a507110e7988077fe62048bf984d4009e722d877b178206cef600221
 SHA512 
fe3db78813987a15ed93d182968bcd5139e1d03f29d3e8effd9fce59f87bc8309407af0b2fa5f1cd83b8583e50ea0ade6b8eafc5dda6dea9161832dc9cebfdfe
 DIST i3-4.15.tar.bz2 1196263 BLAKE2B 
36f20327202957dba30aface91af4d2c6261979e726584712a508a11cb4a612d812e771dc9f28ec4cfcbf3ebc9d92c72f5e940048516cca0f185eab20f95ae32
 SHA512 
60ab61b7e380342126bea12fb4371f98fcf18f6435f79a9519d3f59cfabdb170634366036e1aa20c5592da0832b03140ad1f0c72bad3cfaace0b7c57ad01dfc4
+DIST i3-4.16.1.tar.bz2 1211532 BLAKE2B 
64a6996c0b89516069b58bf1cba92908a7f61ab04d66659b612b27411eb92fa9d49a7214eccdba33e7c33605b5f9247f69c1f0e23de629552edf113ab7520747
 SHA512 
3e328f8c7216697c5e484ca854605350f78844e24cc6cfb9c10e71368c2c0457387a14f819abdf8be2370d437889297f452fbf63f3924766ca81c157ab27e1b0
 DIST i3-4.16.tar.bz2 1213251 BLAKE2B 
a65d15278a83bac9903a611628ea53c64cd554ab9fff2a8864e649fd962858b2f3e77fe69d0dc70affc93dc69b3cbbd7b3ee670a2af9d697e28e9e4ea3323f67
 SHA512 
99abd15349ee8e61c084b3664ef3a189c92ea07812ac59eb6a5441df7cebea8211be52204e39bddcc33d8c714447fddbbe2c5c8a25b756a96e2dc6732526cbf8

diff --git a/x11-wm/i3/i3-4.16.1.ebuild b/x11-wm/i3/i3-4.16.1.ebuild
new file mode 100644
index 000..40e2cfb9d89
--- /dev/null
+++ b/x11-wm/i3/i3-4.16.1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools out-of-source virtualx
+
+DESCRIPTION="An improved dynamic tiling window manager"
+HOMEPAGE="https://i3wm.org/;
+SRC_URI="https://i3wm.org/downloads/${P}.tar.bz2;
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc debug test"
+
+CDEPEND="dev-libs/libev
+   dev-libs/libpcre
+   >=dev-libs/yajl-2.0.3
+   x11-libs/libxcb[xkb]
+   x11-libs/libxkbcommon[X]
+   x11-libs/startup-notification
+   x11-libs/xcb-util
+   x11-libs/xcb-util-cursor
+   x11-libs/xcb-util-keysyms
+   x11-libs/xcb-util-wm
+   x11-libs/xcb-util-xrm
+   x11-misc/xkeyboard-config
+   >=x11-libs/cairo-1.14.4[X,xcb]
+   >=x11-libs/pango-1.30.0[X]"
+DEPEND="${CDEPEND}
+   test? (
+   dev-perl/AnyEvent
+   >=dev-perl/X11-XCB-0.120.0
+   dev-perl/Inline
+   dev-perl/Inline-C
+   dev-perl/IPC-Run
+   dev-perl/ExtUtils-PkgConfig
+   dev-perl/local-lib
+   >=virtual/perl-Test-Simple-0.940.0
+   x11-base/xorg-server[xephyr]
+   )
+"
+RDEPEND="${CDEPEND}
+   dev-lang/perl
+   dev-perl/AnyEvent-I3
+   dev-perl/JSON-XS"
+BDEPEND="virtual/pkgconfig"
+
+# Test without debug will apply optimization levels, which results
+# in type-punned pointers - which in turn causes test failures.
+REQUIRED_USE="test? ( debug )"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-4.16-musl-GLOB_TILDE.patch"
+)
+
+# https://github.com/i3/i3/issues/3013
+RESTRICT="test"
+
+src_prepare() {
+   default
+
+   cat <<- EOF > "${T}"/i3wm
+   #!/bin/sh
+   exec /usr/bin/i3
+   EOF
+
+   eautoreconf
+}
+
+my_src_configure() {
+   local myeconfargs=(
+   $(use_enable debug)
+   )
+   econf "${myeconfargs[@]}"
+}
+
+my_src_test() {
+   emake \
+   test.commands_parser \
+   test.config_parser \
+   test.inject_randr15
+
+   virtx perl \
+   -I "${S}/testcases/lib" \
+   -I "${BUILD_DIR}/testcases/lib" \
+   testcases/complete-run.pl
+}
+
+my_src_install_all() {
+   doman man/*.1
+
+   einstalldocs
+   use doc && dodoc -r docs "RELEASE-NOTES-${PV}"

[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/, x11-wm/i3/files/

2019-03-26 Thread Lars Wendler
commit: bbdedd01a640f44a3d11dfc9fb3def8907260f64
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Mar 26 08:54:57 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Mar 26 08:58:43 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbdedd01

x11-wm/i3: Removed old.

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 x11-wm/i3/Manifest   |   2 -
 x11-wm/i3/files/i3-4.13-remove-git-polling.patch |  19 
 x11-wm/i3/i3-4.13-r1.ebuild  |  88 -
 x11-wm/i3/i3-4.14.1.ebuild   | 114 ---
 4 files changed, 223 deletions(-)

diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index 815dd064801..c2509315514 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -1,5 +1,3 @@
-DIST i3-4.13.tar.bz2 1121298 BLAKE2B 
94f3940406d43083c8dc577b4216a32a08ad4c4b58e7707cc9e3129038f4d13043c1f86e8de03d0fdfcff73f0de582fc8b3c88d71c0161ac3eefe28329f67a64
 SHA512 
1bb1044e8d86e78d3ccb79d49f0eb26665dcd05a348058a5e57138151d74f57d77830efc3025893170fe1b8ec612f739f75247a427410f96286b09afd2c5f14c
-DIST i3-4.14.1.tar.bz2 1173560 BLAKE2B 
96a0e1d75be13098fd530c3970464ce7710063f517c0d538939de6e7c799ab6b3ec005fb50216b1db4ccefd44584c584b263ac359bd9a86be53418d8f8d4beba
 SHA512 
ef628af002947b40e1c88b0e872c6e93d4377a9674a120bd9adc3f323a38570b05124cd3047b5a26659e72070de2d00d83fb93186510c74ad8ddbf4f3df85472
 DIST i3-4.14.tar.gz 3936748 BLAKE2B 
42678130be56bc695e5700e978ddbd34bfdaeda7a65252a05568581d76fe613e80e710f3a507110e7988077fe62048bf984d4009e722d877b178206cef600221
 SHA512 
fe3db78813987a15ed93d182968bcd5139e1d03f29d3e8effd9fce59f87bc8309407af0b2fa5f1cd83b8583e50ea0ade6b8eafc5dda6dea9161832dc9cebfdfe
 DIST i3-4.15.tar.bz2 1196263 BLAKE2B 
36f20327202957dba30aface91af4d2c6261979e726584712a508a11cb4a612d812e771dc9f28ec4cfcbf3ebc9d92c72f5e940048516cca0f185eab20f95ae32
 SHA512 
60ab61b7e380342126bea12fb4371f98fcf18f6435f79a9519d3f59cfabdb170634366036e1aa20c5592da0832b03140ad1f0c72bad3cfaace0b7c57ad01dfc4
 DIST i3-4.16.1.tar.bz2 1211532 BLAKE2B 
64a6996c0b89516069b58bf1cba92908a7f61ab04d66659b612b27411eb92fa9d49a7214eccdba33e7c33605b5f9247f69c1f0e23de629552edf113ab7520747
 SHA512 
3e328f8c7216697c5e484ca854605350f78844e24cc6cfb9c10e71368c2c0457387a14f819abdf8be2370d437889297f452fbf63f3924766ca81c157ab27e1b0

diff --git a/x11-wm/i3/files/i3-4.13-remove-git-polling.patch 
b/x11-wm/i3/files/i3-4.13-remove-git-polling.patch
deleted file mode 100644
index ca226378ed7..000
--- a/x11-wm/i3/files/i3-4.13-remove-git-polling.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Naur a/configure.ac b/configure.ac
 a/configure.ac 2017-01-13 13:31:25.250216293 +0100
-+++ b/configure.ac 2017-01-13 13:31:55.930217956 +0100
-@@ -146,15 +146,6 @@
-   print_BUILD_MANS=no
- fi
- 
--git_dir=`git rev-parse --git-dir 2>/dev/null`
--if test -n "$git_dir"; then
--  srcdir=`dirname "$git_dir"`
--  exclude_dir=`pwd | sed "s,^$srcdir,,g"`
--  if ! grep -q "^$exclude_dir" "$git_dir/info/exclude"; then
--  echo "$exclude_dir" >> "$git_dir/info/exclude"
--  fi
--fi
--
- echo \
- 
"
- build configured:

diff --git a/x11-wm/i3/i3-4.13-r1.ebuild b/x11-wm/i3/i3-4.13-r1.ebuild
deleted file mode 100644
index 2b809ac551d..000
--- a/x11-wm/i3/i3-4.13-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="An improved dynamic tiling window manager"
-HOMEPAGE="https://i3wm.org/;
-SRC_URI="https://i3wm.org/downloads/${P}.tar.bz2;
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="doc"
-
-CDEPEND="dev-libs/libev
-   dev-libs/libpcre
-   >=dev-libs/yajl-2.0.3
-   x11-libs/libxcb[xkb]
-   x11-libs/libxkbcommon[X]
-   x11-libs/startup-notification
-   x11-libs/xcb-util
-   x11-libs/xcb-util-cursor
-   x11-libs/xcb-util-keysyms
-   x11-libs/xcb-util-wm
-   x11-libs/xcb-util-xrm
-   >=x11-libs/cairo-1.14.4[X,xcb]
-   >=x11-libs/pango-1.30.0[X]"
-DEPEND="${CDEPEND}
-   doc? ( app-text/asciidoc app-text/xmlto dev-lang/perl )
-   virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-   dev-lang/perl
-   dev-perl/AnyEvent-I3
-   dev-perl/JSON-XS"
-
-DOCS=( RELEASE-NOTES-${PV} )
-PATCHES=(
-   "${FILESDIR}/${P}-remove-git-polling.patch"
-   "${FILESDIR}/${PN}-musl-GLOB_TILDE.patch"
-)
-
-src_prepare() {
-   default
-   if ! use doc ; then
-   sed -e '/AC_PATH_PROG(\[PATH_ASCIIDOC/d' -i configure.ac || die
-   eautoreconf
-   fi
-   cat <<- EOF > "${T}"/i3wm
-   #!/bin/sh
-   exec /usr/bin/i3
-   EOF
-}
-
-src_configure() {
-   local myeconfargs=( --enable-debug=no )  # otherwise injects -O0 

[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3-gaps/

2019-03-10 Thread Johannes Huber
commit: dc10a595ba2d4cea3834617c194e5b3645201e13
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun Mar 10 09:38:37 2019 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sun Mar 10 09:40:16 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc10a595

x11-wm/i3-gaps: Version bump 4.16.1

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Johannes Huber  gentoo.org>

 x11-wm/i3-gaps/Manifest  |  1 +
 x11-wm/i3-gaps/i3-gaps-4.16.1.ebuild | 87 
 2 files changed, 88 insertions(+)

diff --git a/x11-wm/i3-gaps/Manifest b/x11-wm/i3-gaps/Manifest
index 302cf42bc0e..80f416b1cd9 100644
--- a/x11-wm/i3-gaps/Manifest
+++ b/x11-wm/i3-gaps/Manifest
@@ -1,2 +1,3 @@
 DIST i3-gaps-4.15.0.1.tar.gz 3965631 BLAKE2B 
ea65886c40f377125bafbd80e2d56c1d66a4c5c06d942d645b2cb226323a0903e98aa58b67da9c31c60240b5d99d10ecc20864aeede95a5039ea0ffdff8dcb8b
 SHA512 
76ff860e4ca0edd0e22bdff9ae9b1bc150df2b5bc15b0d7ea7a63d373e8d156a43bd91f8a40c48b4c771603f7de7c18c6d16c53fef582e53f51c53a197fa7a0a
+DIST i3-gaps-4.16.1.tar.gz 3983420 BLAKE2B 
f0d5a85b06ce33e1cc177af6da29f9cdf42ed754bb767aa9eaa5ab52f3b9f4f688d251f2a16fb222fc8cf5052e79859891c4185b1325b2ef6c1a813aa220468c
 SHA512 
904c2f63c6a35573f13fd216625c1349ac71de70ae8f0440667c9d76048cdaf30a398ab358f2366d5f46502d87e801713b625cb509a05f39dbca1371d2b8d0e9
 DIST i3-gaps-4.16.tar.gz 3985226 BLAKE2B 
da61ab6b476a30a4acab24590cd5ca51f0f51318988890e66530fdd76d99236378d9c678e1e37da99e22e70b0e5e0e5895b8146bd5a93b23957cb1e0178e08b1
 SHA512 
64a392d2b4175e063f0740ee04885156dbd2571262c22df6276e8eaac36765cd03822723208118a1998ff6cbbcd973fb7f6305df9744c477262d5d33b792ee23

diff --git a/x11-wm/i3-gaps/i3-gaps-4.16.1.ebuild 
b/x11-wm/i3-gaps/i3-gaps-4.16.1.ebuild
new file mode 100644
index 000..8ea48ba30b5
--- /dev/null
+++ b/x11-wm/i3-gaps/i3-gaps-4.16.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="i3 fork with gaps and some more features"
+HOMEPAGE="https://github.com/Airblader/i3;
+SRC_URI="https://github.com/Airblader/i3/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+   dev-libs/glib:2
+   dev-libs/libev
+   dev-libs/libpcre
+   dev-libs/yajl
+   x11-libs/cairo[X,xcb]
+   x11-libs/libxcb[xkb]
+   x11-libs/libxkbcommon[X]
+   x11-libs/pango[X]
+   x11-libs/startup-notification
+   x11-libs/xcb-util
+   x11-libs/xcb-util-cursor
+   x11-libs/xcb-util-keysyms
+   x11-libs/xcb-util-wm
+   x11-libs/xcb-util-xrm
+"
+BDEPEND="
+   virtual/pkgconfig
+"
+RDEPEND="${DEPEND}
+   dev-lang/perl
+   dev-perl/AnyEvent-I3
+   dev-perl/JSON-XS
+   !x11-wm/i3
+"
+
+S=${WORKDIR}/i3-${PV}
+
+DOCS=( RELEASE-NOTES-$(ver_cut 1-3) )
+
+PATCHES=( "${FILESDIR}/${PN}-$(ver_cut 1-2)-musl.patch" )
+
+src_prepare() {
+   default
+   sed -e '/AC_PATH_PROG(\[PATH_ASCIIDOC/d' -i configure.ac || die
+   eautoreconf
+   cat <<- EOF > "${T}"/i3wm
+   #!/bin/sh
+   exec /usr/bin/i3
+   EOF
+}
+
+src_configure() {
+   # disable sanitizer: otherwise injects -O0 -g
+   local myeconfargs=(
+   --enable-debug=no
+   --disable-sanitizers
+   )
+   econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+   emake -C "${CBUILD}"
+}
+
+src_install() {
+   emake -C "${CBUILD}" DESTDIR="${D}" install
+   einstalldocs
+
+   exeinto /etc/X11/Sessions
+   doexe "${T}"/i3wm
+}
+
+pkg_postinst() {
+   einfo "There are several packages that you may find useful with ${PN} 
and"
+   einfo "their usage is suggested by the upstream maintainers, namely:"
+   einfo "  x11-misc/dmenu"
+   einfo "  x11-misc/i3lock"
+   einfo "  x11-misc/i3status"
+   einfo "Please refer to their description for additional info."
+}



[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/

2018-11-29 Thread Lars Wendler
commit: c676664e275123059f21625c64b74b38ce0f414e
Author: Nelo-T. Wallus  wallus  de>
AuthorDate: Wed Nov 28 22:16:43 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Nov 29 08:34:14 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c676664e

x11-wm/i3: Use current musl patch for live ebuild

Signed-off-by: Nelo-Thara Naum Nathanael Wallus  wallus.de>

Package-Manager: Portage-2.3.51, Repoman-2.3.12
Closes: https://github.com/gentoo/gentoo/pull/10516
Signed-off-by: Lars Wendler  gentoo.org>

 x11-wm/i3/i3-.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-wm/i3/i3-.ebuild b/x11-wm/i3/i3-.ebuild
index 44462428862..d8f7ca7c3a6 100644
--- a/x11-wm/i3/i3-.ebuild
+++ b/x11-wm/i3/i3-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -39,7 +39,7 @@ RDEPEND="${CDEPEND}
dev-perl/JSON-XS"
 
 PATCHES=(
-   "${FILESDIR}/${PN}-musl-GLOB_TILDE.patch"
+   "${FILESDIR}/${PN}-4.16-musl-GLOB_TILDE.patch"
 )
 
 src_prepare() {



[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3-gaps/, x11-wm/i3-gaps/files/

2018-11-17 Thread Johannes Huber
commit: c3da12df17dfa8f7959b80fa2cf7c1bb4d269de3
Author: Johannes Huber  gentoo  org>
AuthorDate: Sat Nov 17 09:52:33 2018 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sat Nov 17 09:52:33 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3da12df

x11-wm/i3-gaps: Version bump 4.16

Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Johannes Huber  gentoo.org>

 x11-wm/i3-gaps/Manifest  |  1 +
 x11-wm/i3-gaps/files/i3-gaps-4.16-musl.patch | 86 +++
 x11-wm/i3-gaps/i3-gaps-4.16.ebuild   | 87 
 3 files changed, 174 insertions(+)

diff --git a/x11-wm/i3-gaps/Manifest b/x11-wm/i3-gaps/Manifest
index fe96407b113..302cf42bc0e 100644
--- a/x11-wm/i3-gaps/Manifest
+++ b/x11-wm/i3-gaps/Manifest
@@ -1 +1,2 @@
 DIST i3-gaps-4.15.0.1.tar.gz 3965631 BLAKE2B 
ea65886c40f377125bafbd80e2d56c1d66a4c5c06d942d645b2cb226323a0903e98aa58b67da9c31c60240b5d99d10ecc20864aeede95a5039ea0ffdff8dcb8b
 SHA512 
76ff860e4ca0edd0e22bdff9ae9b1bc150df2b5bc15b0d7ea7a63d373e8d156a43bd91f8a40c48b4c771603f7de7c18c6d16c53fef582e53f51c53a197fa7a0a
+DIST i3-gaps-4.16.tar.gz 3985226 BLAKE2B 
da61ab6b476a30a4acab24590cd5ca51f0f51318988890e66530fdd76d99236378d9c678e1e37da99e22e70b0e5e0e5895b8146bd5a93b23957cb1e0178e08b1
 SHA512 
64a392d2b4175e063f0740ee04885156dbd2571262c22df6276e8eaac36765cd03822723208118a1998ff6cbbcd973fb7f6305df9744c477262d5d33b792ee23

diff --git a/x11-wm/i3-gaps/files/i3-gaps-4.16-musl.patch 
b/x11-wm/i3-gaps/files/i3-gaps-4.16-musl.patch
new file mode 100644
index 000..1e67ec2a3c4
--- /dev/null
+++ b/x11-wm/i3-gaps/files/i3-gaps-4.16-musl.patch
@@ -0,0 +1,86 @@
+From: Natanael Copa 
+Patch-Source: 
https://git.alpinelinux.org/cgit/aports/tree/community/i3wm/musl.patch
+Project-Bug-URL: https://github.com/i3/i3/issues/1859
+Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=609306
+
+Musl doesn't implement GLOB_TILDE, which is used by i3 when expanding paths.
+
+This patch replaces usage of GLOB_TILDE in glob() by replacing tilde
+with the content of $HOME - if set - manually.
+
+As mentioned in the i3 bugtracker this is an issue that should be solved by 
musl.
+
+A patch has been sent to musl upstream, but it hasn't been merged yet:
+http://www.openwall.com/lists/musl/2017/01/17/1
+---
+--- a/i3bar/src/main.c
 b/i3bar/src/main.c
+@@ -48,14 +48,20 @@ void debuglog(char *fmt, ...) {
+  *
+  */
+ static char *expand_path(char *path) {
+-static glob_t globbuf;
+-if (glob(path, GLOB_NOCHECK | GLOB_TILDE, NULL, ) < 0) {
+-ELOG("glob() failed\n");
+-exit(EXIT_FAILURE);
++char *home, *expanded;
++
++if (strncmp(path, "~/", 2) == 0) {
++home = getenv("HOME");
++if (home != NULL) {
++/* new length: sum - 1 (omit '~') + 1 (for '\0') */
++expanded = scalloc(strlen(home)+strlen(path), 1);
++strcpy(expanded, home);
++strcat(expanded, path+1);
++return expanded;
++}
+ }
+-char *result = sstrdup(globbuf.gl_pathc > 0 ? globbuf.gl_pathv[0] : path);
+-globfree();
+-return result;
++
++return sstrdup(path);
+ }
+
+ void print_usage(char *elf_name) {
+--- a/libi3/resolve_tilde.c
 b/libi3/resolve_tilde.c
+@@ -19,28 +19,18 @@
+  *
+  */
+ char *resolve_tilde(const char *path) {
+-static glob_t globbuf;
+-char *head, *tail, *result;
++char *home, *expanded;
+
+-tail = strchr(path, '/');
+-head = sstrndup(path, tail ? (size_t)(tail - path) : strlen(path));
+-
+-int res = glob(head, GLOB_TILDE, NULL, );
+-free(head);
+-/* no match, or many wildcard matches are bad */
+-if (res == GLOB_NOMATCH || globbuf.gl_pathc != 1)
+-result = sstrdup(path);
+-else if (res != 0) {
+-err(EXIT_FAILURE, "glob() failed");
+-} else {
+-head = globbuf.gl_pathv[0];
+-result = scalloc(strlen(head) + (tail ? strlen(tail) : 0) + 1, 1);
+-strcpy(result, head);
+-if (tail) {
+-strcat(result, tail);
++if (strncmp(path, "~/", 2) == 0) {
++home = getenv("HOME");
++if (home != NULL) {
++/* new length: sum - 1 (omit '~') + 1 (for '\0') */
++expanded = scalloc(strlen(home)+strlen(path), 1);
++strcpy(expanded, home);
++strcat(expanded, path+1);
++return expanded;
+ }
+ }
+-globfree();
+
+-return result;
++return sstrdup(path);
+ }

diff --git a/x11-wm/i3-gaps/i3-gaps-4.16.ebuild 
b/x11-wm/i3-gaps/i3-gaps-4.16.ebuild
new file mode 100644
index 000..d3e62d0fb17
--- /dev/null
+++ b/x11-wm/i3-gaps/i3-gaps-4.16.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="i3 fork with gaps and some more features"
+HOMEPAGE="https://github.com/Airblader/i3;

[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/, x11-wm/i3/files/

2018-11-08 Thread Lars Wendler
commit: 5e19b9fce12ec9abab5948ddfccaf74b620e93d9
Author: Nelo-T. Wallus  wallus  de>
AuthorDate: Wed Nov  7 20:40:33 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Nov  8 09:49:15 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e19b9fc

x11-wm/i3: Bump to v4.16

Closes: https://bugs.gentoo.org/670570
Package-Manager: Portage-2.3.51, Repoman-2.3.10

Signed-off-by: Nelo-Thara Nahum Nathanael Wallus  wallus.de>
Closes: https://github.com/gentoo/gentoo/pull/10357
Signed-off-by: Lars Wendler  gentoo.org>

 x11-wm/i3/Manifest|   1 +
 x11-wm/i3/files/i3-4.16-musl-GLOB_TILDE.patch |  86 
 x11-wm/i3/i3-4.16.ebuild  | 110 ++
 3 files changed, 197 insertions(+)

diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index 918f8f2a026..37fd66cefdd 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -2,3 +2,4 @@ DIST i3-4.13.tar.bz2 1121298 BLAKE2B 
94f3940406d43083c8dc577b4216a32a08ad4c4b58e
 DIST i3-4.14.1.tar.bz2 1173560 BLAKE2B 
96a0e1d75be13098fd530c3970464ce7710063f517c0d538939de6e7c799ab6b3ec005fb50216b1db4ccefd44584c584b263ac359bd9a86be53418d8f8d4beba
 SHA512 
ef628af002947b40e1c88b0e872c6e93d4377a9674a120bd9adc3f323a38570b05124cd3047b5a26659e72070de2d00d83fb93186510c74ad8ddbf4f3df85472
 DIST i3-4.14.tar.gz 3936748 BLAKE2B 
42678130be56bc695e5700e978ddbd34bfdaeda7a65252a05568581d76fe613e80e710f3a507110e7988077fe62048bf984d4009e722d877b178206cef600221
 SHA512 
fe3db78813987a15ed93d182968bcd5139e1d03f29d3e8effd9fce59f87bc8309407af0b2fa5f1cd83b8583e50ea0ade6b8eafc5dda6dea9161832dc9cebfdfe
 DIST i3-4.15.tar.bz2 1196263 BLAKE2B 
36f20327202957dba30aface91af4d2c6261979e726584712a508a11cb4a612d812e771dc9f28ec4cfcbf3ebc9d92c72f5e940048516cca0f185eab20f95ae32
 SHA512 
60ab61b7e380342126bea12fb4371f98fcf18f6435f79a9519d3f59cfabdb170634366036e1aa20c5592da0832b03140ad1f0c72bad3cfaace0b7c57ad01dfc4
+DIST i3-4.16.tar.bz2 1213251 BLAKE2B 
a65d15278a83bac9903a611628ea53c64cd554ab9fff2a8864e649fd962858b2f3e77fe69d0dc70affc93dc69b3cbbd7b3ee670a2af9d697e28e9e4ea3323f67
 SHA512 
99abd15349ee8e61c084b3664ef3a189c92ea07812ac59eb6a5441df7cebea8211be52204e39bddcc33d8c714447fddbbe2c5c8a25b756a96e2dc6732526cbf8

diff --git a/x11-wm/i3/files/i3-4.16-musl-GLOB_TILDE.patch 
b/x11-wm/i3/files/i3-4.16-musl-GLOB_TILDE.patch
new file mode 100644
index 000..1e67ec2a3c4
--- /dev/null
+++ b/x11-wm/i3/files/i3-4.16-musl-GLOB_TILDE.patch
@@ -0,0 +1,86 @@
+From: Natanael Copa 
+Patch-Source: 
https://git.alpinelinux.org/cgit/aports/tree/community/i3wm/musl.patch
+Project-Bug-URL: https://github.com/i3/i3/issues/1859
+Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=609306
+
+Musl doesn't implement GLOB_TILDE, which is used by i3 when expanding paths.
+
+This patch replaces usage of GLOB_TILDE in glob() by replacing tilde
+with the content of $HOME - if set - manually.
+
+As mentioned in the i3 bugtracker this is an issue that should be solved by 
musl.
+
+A patch has been sent to musl upstream, but it hasn't been merged yet:
+http://www.openwall.com/lists/musl/2017/01/17/1
+---
+--- a/i3bar/src/main.c
 b/i3bar/src/main.c
+@@ -48,14 +48,20 @@ void debuglog(char *fmt, ...) {
+  *
+  */
+ static char *expand_path(char *path) {
+-static glob_t globbuf;
+-if (glob(path, GLOB_NOCHECK | GLOB_TILDE, NULL, ) < 0) {
+-ELOG("glob() failed\n");
+-exit(EXIT_FAILURE);
++char *home, *expanded;
++
++if (strncmp(path, "~/", 2) == 0) {
++home = getenv("HOME");
++if (home != NULL) {
++/* new length: sum - 1 (omit '~') + 1 (for '\0') */
++expanded = scalloc(strlen(home)+strlen(path), 1);
++strcpy(expanded, home);
++strcat(expanded, path+1);
++return expanded;
++}
+ }
+-char *result = sstrdup(globbuf.gl_pathc > 0 ? globbuf.gl_pathv[0] : path);
+-globfree();
+-return result;
++
++return sstrdup(path);
+ }
+
+ void print_usage(char *elf_name) {
+--- a/libi3/resolve_tilde.c
 b/libi3/resolve_tilde.c
+@@ -19,28 +19,18 @@
+  *
+  */
+ char *resolve_tilde(const char *path) {
+-static glob_t globbuf;
+-char *head, *tail, *result;
++char *home, *expanded;
+
+-tail = strchr(path, '/');
+-head = sstrndup(path, tail ? (size_t)(tail - path) : strlen(path));
+-
+-int res = glob(head, GLOB_TILDE, NULL, );
+-free(head);
+-/* no match, or many wildcard matches are bad */
+-if (res == GLOB_NOMATCH || globbuf.gl_pathc != 1)
+-result = sstrdup(path);
+-else if (res != 0) {
+-err(EXIT_FAILURE, "glob() failed");
+-} else {
+-head = globbuf.gl_pathv[0];
+-result = scalloc(strlen(head) + (tail ? strlen(tail) : 0) + 1, 1);
+-strcpy(result, head);
+-if (tail) {
+-strcat(result, tail);
++if (strncmp(path, "~/", 2) == 0) {
++home = getenv("HOME");
++if (home != NULL) 

[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/

2018-10-24 Thread Lars Wendler
commit: 1fec4a8053339c8b7d712098f25dc74d5024e429
Author: pini  tuxfamily  org>
AuthorDate: Wed Oct  3 06:26:12 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Oct 24 13:27:36 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fec4a80

x11-vm/i3: remove doc conditional in 4.15

Signed-off-by: pini  tuxfamily.org>
Closes: https://github.com/gentoo/gentoo/pull/10051
Signed-off-by: Lars Wendler  gentoo.org>

 x11-wm/i3/i3-4.15.ebuild | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/x11-wm/i3/i3-4.15.ebuild b/x11-wm/i3/i3-4.15.ebuild
index 350a31d9758..0bd559fa4ae 100644
--- a/x11-wm/i3/i3-4.15.ebuild
+++ b/x11-wm/i3/i3-4.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -31,8 +31,6 @@ CDEPEND="dev-libs/libev
>=x11-libs/cairo-1.14.4[X,xcb]
>=x11-libs/pango-1.30.0[X]"
 DEPEND="${CDEPEND}
-   app-text/asciidoc
-   doc? ( app-text/xmlto dev-lang/perl )
test? (
dev-perl/AnyEvent
>=dev-perl/X11-XCB-0.120.0



[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/

2018-10-02 Thread Mikle Kolyada
commit: e3ee86b4ef243f86cccd21fc085ba7d29565378f
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Tue Oct  2 14:26:30 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Tue Oct  2 14:26:30 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3ee86b4

x11-wm/i3: amd64 stable wrt bug #658896

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 x11-wm/i3/i3-4.15.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/i3/i3-4.15.ebuild b/x11-wm/i3/i3-4.15.ebuild
index d9e2a745104..350a31d9758 100644
--- a/x11-wm/i3/i3-4.15.ebuild
+++ b/x11-wm/i3/i3-4.15.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://i3wm.org/downloads/${P}.tar.bz2;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc debug test"
 
 CDEPEND="dev-libs/libev



[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/

2018-09-11 Thread Lars Wendler
commit: fe6520c33d86aa869cf6e42b769370d8218ff741
Author: Francesco Turco  fastmail  fm>
AuthorDate: Sun Aug 26 18:08:31 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Sep 11 08:03:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe6520c3

x11-wm/i3: show elog message only on first installation

Closes: https://github.com/gentoo/gentoo/pull/9703

 x11-wm/i3/i3-4.13-r1.ebuild | 17 ++---
 x11-wm/i3/i3-4.14.1.ebuild  | 15 +--
 x11-wm/i3/i3-4.14.ebuild| 17 ++---
 x11-wm/i3/i3-4.15.ebuild| 15 +--
 x11-wm/i3/i3-.ebuild| 18 +++---
 5 files changed, 49 insertions(+), 33 deletions(-)

diff --git a/x11-wm/i3/i3-4.13-r1.ebuild b/x11-wm/i3/i3-4.13-r1.ebuild
index acfef3313c8..2b809ac551d 100644
--- a/x11-wm/i3/i3-4.13-r1.ebuild
+++ b/x11-wm/i3/i3-4.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -76,10 +76,13 @@ src_install() {
 }
 
 pkg_postinst() {
-   einfo "There are several packages that you may find useful with ${PN} 
and"
-   einfo "their usage is suggested by the upstream maintainers, namely:"
-   einfo "  x11-misc/dmenu"
-   einfo "  x11-misc/i3status"
-   einfo "  x11-misc/i3lock"
-   einfo "Please refer to their description for additional info."
+   # Only show the elog information on a new install
+   if [[ ! ${REPLACING_VERSIONS} ]]; then
+   elog "There are several packages that you may find useful with 
${PN} and"
+   elog "their usage is suggested by the upstream maintainers, 
namely:"
+   elog "  x11-misc/dmenu"
+   elog "  x11-misc/i3status"
+   elog "  x11-misc/i3lock"
+   elog "Please refer to their description for additional info."
+   fi
 }

diff --git a/x11-wm/i3/i3-4.14.1.ebuild b/x11-wm/i3/i3-4.14.1.ebuild
index 3c204ad407f..a10e0a5f9e4 100644
--- a/x11-wm/i3/i3-4.14.1.ebuild
+++ b/x11-wm/i3/i3-4.14.1.ebuild
@@ -102,10 +102,13 @@ my_src_install_all() {
 }
 
 pkg_postinst() {
-   einfo "There are several packages that you may find useful with ${PN} 
and"
-   einfo "their usage is suggested by the upstream maintainers, namely:"
-   einfo "  x11-misc/dmenu"
-   einfo "  x11-misc/i3status"
-   einfo "  x11-misc/i3lock"
-   einfo "Please refer to their description for additional info."
+   # Only show the elog information on a new install
+   if [[ ! ${REPLACING_VERSIONS} ]]; then
+   elog "There are several packages that you may find useful with 
${PN} and"
+   elog "their usage is suggested by the upstream maintainers, 
namely:"
+   elog "  x11-misc/dmenu"
+   elog "  x11-misc/i3status"
+   elog "  x11-misc/i3lock"
+   elog "Please refer to their description for additional info."
+   fi
 }

diff --git a/x11-wm/i3/i3-4.14.ebuild b/x11-wm/i3/i3-4.14.ebuild
index b98df36f927..26d946ec6f0 100644
--- a/x11-wm/i3/i3-4.14.ebuild
+++ b/x11-wm/i3/i3-4.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -90,10 +90,13 @@ src_install() {
 }
 
 pkg_postinst() {
-   einfo "There are several packages that you may find useful with ${PN} 
and"
-   einfo "their usage is suggested by the upstream maintainers, namely:"
-   einfo "  x11-misc/dmenu"
-   einfo "  x11-misc/i3status"
-   einfo "  x11-misc/i3lock"
-   einfo "Please refer to their description for additional info."
+   # Only show the elog information on a new install
+   if [[ ! ${REPLACING_VERSIONS} ]]; then
+   elog "There are several packages that you may find useful with 
${PN} and"
+   elog "their usage is suggested by the upstream maintainers, 
namely:"
+   elog "  x11-misc/dmenu"
+   elog "  x11-misc/i3status"
+   elog "  x11-misc/i3lock"
+   elog "Please refer to their description for additional info."
+   fi
 }

diff --git a/x11-wm/i3/i3-4.15.ebuild b/x11-wm/i3/i3-4.15.ebuild
index df485534f2f..90f223b0d2c 100644
--- a/x11-wm/i3/i3-4.15.ebuild
+++ b/x11-wm/i3/i3-4.15.ebuild
@@ -102,10 +102,13 @@ my_src_install_all() {
 }
 
 pkg_postinst() {
-   einfo "There are several packages that you may find useful with ${PN} 
and"
-   einfo "their usage is suggested by the upstream maintainers, namely:"
-   einfo "  x11-misc/dmenu"
-   einfo "  x11-misc/i3status"
-   einfo "  x11-misc/i3lock"
-   einfo "Please refer to their description for additional info."
+   # Only show the elog information on a new install
+   if [[ ! ${REPLACING_VERSIONS} ]]; then
+   elog "There are several packages 

[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3-gaps/

2018-06-23 Thread Mikle Kolyada
commit: c24317155744f941003662273f424dda18eaa390
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Jun 23 18:42:22 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Jun 23 18:42:34 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2431715

x11-wm/i3-gaps: amd64 stable wrt bug #658094

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 x11-wm/i3-gaps/i3-gaps-4.15.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/i3-gaps/i3-gaps-4.15.0.1.ebuild 
b/x11-wm/i3-gaps/i3-gaps-4.15.0.1.ebuild
index 341c943d041..a4357937c21 100644
--- a/x11-wm/i3-gaps/i3-gaps-4.15.0.1.ebuild
+++ b/x11-wm/i3-gaps/i3-gaps-4.15.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Airblader/i3/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 CDEPEND="



[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3-gaps/

2018-06-17 Thread Thomas Deutschmann
commit: d12945efb1b96dbf7c26ab03f27737f65d34fc1a
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Jun 17 22:55:29 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Jun 17 23:28:14 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d12945ef

x11-wm/i3-gaps: x86 stable (bug #658094)

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 x11-wm/i3-gaps/i3-gaps-4.15.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/i3-gaps/i3-gaps-4.15.0.1.ebuild 
b/x11-wm/i3-gaps/i3-gaps-4.15.0.1.ebuild
index 54936b5b78b..341c943d041 100644
--- a/x11-wm/i3-gaps/i3-gaps-4.15.0.1.ebuild
+++ b/x11-wm/i3-gaps/i3-gaps-4.15.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Airblader/i3/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 CDEPEND="



[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/, profiles/arch/arm64/

2018-06-04 Thread Mart Raudsepp
commit: 446ebe0711dba438ec1353d18099b22cc8bfd1df
Author: Alex Bennée  linaro  org>
AuthorDate: Thu May 17 13:32:13 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Mon Jun  4 18:57:05 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=446ebe07

x11-wm/i3: add ~arm64 keyword

We also mask out test in profiles/arch/arm64/package.use.mask as it
depends on a bunch of currently un-keyworded perl modules but is
currently disabled due to an upstream bug.

 profiles/arch/arm64/package.use.mask | 5 +
 x11-wm/i3/i3-4.15.ebuild | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/profiles/arch/arm64/package.use.mask 
b/profiles/arch/arm64/package.use.mask
index fc75fc61cf8..ee9cb80813e 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Alex Bennee  (31 May 2018)
+# bunch of dev-perl packages not yet keyworded
+# and the i3 ebuild currently has RESTRICT="test" due to upstream bug
+x11-wm/i3 test
+
 # Mart Raudsepp  (30 May 2018)
 # app-text/pandoc not keyworded yet
 app-emulation/xen-tools doc

diff --git a/x11-wm/i3/i3-4.15.ebuild b/x11-wm/i3/i3-4.15.ebuild
index 3c204ad407f..df485534f2f 100644
--- a/x11-wm/i3/i3-4.15.ebuild
+++ b/x11-wm/i3/i3-4.15.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://i3wm.org/downloads/${P}.tar.bz2;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="doc debug test"
 
 CDEPEND="dev-libs/libev



[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3-gaps/files/, x11-wm/i3-gaps/

2018-05-09 Thread Johannes Huber
commit: 0cb1e8bf4d5d641aac0a330a96847815b02bea57
Author: Johannes Huber  gentoo  org>
AuthorDate: Wed May  9 18:12:47 2018 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Wed May  9 18:13:05 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cb1e8bf

x11-wm/i3-gaps: New package

A popular clone[1] of the improved dynamic tiling window manager i3
which supports gaps and few additional features[2]. There are several
ebuilds already in user overlays available[3][4][5]. Ebuild taken from
oboeverlay, improved by me. The original ebuild is probably the original
x11-wm/i3.

[1] https://www.reddit.com/r/unixporn/search?q=gaps_sr=1
[2] https://github.com/Airblader/i3
[3] https://github.com/ChrisOboe/oboeverlay/tree/master/x11-wm/i3-gaps
[4] https://github.com/0x4d4c/gentoo-overlay/tree/master/x11-wm/i3-gaps
[5] https://github.com/SonicFrog/overlay/tree/master/x11-wm/i3-gaps

Closes: https://bugs.gentoo.org/654694
Package-Manager: Portage-2.3.36, Repoman-2.3.9

 x11-wm/i3-gaps/Manifest  |  1 +
 x11-wm/i3-gaps/files/i3-gaps-4.15-musl.patch | 73 +++
 x11-wm/i3-gaps/i3-gaps-4.15.0.1.ebuild   | 87 
 x11-wm/i3-gaps/metadata.xml  | 11 
 4 files changed, 172 insertions(+)

diff --git a/x11-wm/i3-gaps/Manifest b/x11-wm/i3-gaps/Manifest
new file mode 100644
index 000..fe96407b113
--- /dev/null
+++ b/x11-wm/i3-gaps/Manifest
@@ -0,0 +1 @@
+DIST i3-gaps-4.15.0.1.tar.gz 3965631 BLAKE2B 
ea65886c40f377125bafbd80e2d56c1d66a4c5c06d942d645b2cb226323a0903e98aa58b67da9c31c60240b5d99d10ecc20864aeede95a5039ea0ffdff8dcb8b
 SHA512 
76ff860e4ca0edd0e22bdff9ae9b1bc150df2b5bc15b0d7ea7a63d373e8d156a43bd91f8a40c48b4c771603f7de7c18c6d16c53fef582e53f51c53a197fa7a0a

diff --git a/x11-wm/i3-gaps/files/i3-gaps-4.15-musl.patch 
b/x11-wm/i3-gaps/files/i3-gaps-4.15-musl.patch
new file mode 100644
index 000..82ad6195b8e
--- /dev/null
+++ b/x11-wm/i3-gaps/files/i3-gaps-4.15-musl.patch
@@ -0,0 +1,73 @@
+diff -urp i3-4.11/i3bar/src/main.c i3-4.11.new/i3bar/src/main.c
+--- i3-4.11/i3bar/src/main.c   2015-09-30 07:55:10.0 +0100
 i3-4.11.new/i3bar/src/main.c   2016-02-08 20:03:41.777392482 +
+@@ -45,14 +45,20 @@ void debuglog(char *fmt, ...) {
+  *
+  */
+ char *expand_path(char *path) {
+-static glob_t globbuf;
+-if (glob(path, GLOB_NOCHECK | GLOB_TILDE, NULL, ) < 0) {
+-ELOG("glob() failed\n");
+-exit(EXIT_FAILURE);
++char *home, *expanded;
++
++if (strncmp(path, "~/", 2) == 0) {
++home = getenv("HOME");
++if (home != NULL) {
++/* new length: sum - 1 (omit '~') + 1 (for '\0') */
++expanded = scalloc(strlen(home)+strlen(path), 1);
++strcpy(expanded, home);
++strcat(expanded, path+1);
++return expanded;
++}
+ }
+-char *result = sstrdup(globbuf.gl_pathc > 0 ? globbuf.gl_pathv[0] : path);
+-globfree();
+-return result;
++
++return sstrdup(path);
+ }
+ 
+ void print_usage(char *elf_name) {
+diff -urp i3-4.11/libi3/resolve_tilde.c i3-4.11.new/libi3/resolve_tilde.c
+--- i3-4.11/libi3/resolve_tilde.c  2015-09-30 07:55:10.0 +0100
 i3-4.11.new/libi3/resolve_tilde.c  2016-02-08 20:03:47.849230953 +
+@@ -19,27 +19,18 @@
+  *
+  */
+ char *resolve_tilde(const char *path) {
+-static glob_t globbuf;
+-char *head, *tail, *result;
++char *home, *expanded;
+ 
+-tail = strchr(path, '/');
+-head = sstrndup(path, tail ? (size_t)(tail - path) : strlen(path));
+-
+-int res = glob(head, GLOB_TILDE, NULL, );
+-free(head);
+-/* no match, or many wildcard matches are bad */
+-if (res == GLOB_NOMATCH || globbuf.gl_pathc != 1)
+-result = sstrdup(path);
+-else if (res != 0) {
+-err(EXIT_FAILURE, "glob() failed");
+-} else {
+-head = globbuf.gl_pathv[0];
+-result = scalloc(strlen(head) + (tail ? strlen(tail) : 0) + 1, 1);
+-strncpy(result, head, strlen(head));
+-if (tail)
+-strncat(result, tail, strlen(tail));
++if (strncmp(path, "~/", 2) == 0) {
++home = getenv("HOME");
++if (home != NULL) {
++/* new length: sum - 1 (omit '~') + 1 (for '\0') */
++expanded = scalloc(strlen(home)+strlen(path), 1);
++strcpy(expanded, home);
++strcat(expanded, path+1);
++return expanded;
++}
+ }
+-globfree();
+ 
+-return result;
++return sstrdup(path);
+ }

diff --git a/x11-wm/i3-gaps/i3-gaps-4.15.0.1.ebuild 
b/x11-wm/i3-gaps/i3-gaps-4.15.0.1.ebuild
new file mode 100644
index 000..54936b5b78b
--- /dev/null
+++ b/x11-wm/i3-gaps/i3-gaps-4.15.0.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eapi7-ver
+
+DESCRIPTION="i3 fork with gaps and some more features"

[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/

2018-03-17 Thread Lars Wendler
commit: 95e45024a65624372d261621a54c17d2a2eea242
Author: Nelo-T. Wallus  wallus  de>
AuthorDate: Sat Mar 17 12:54:09 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sat Mar 17 21:00:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95e45024

x11-wm/i3: Bump to 4.15

Closes: https://bugs.gentoo.org/650218
Package-Manager: Portage-2.3.24, Repoman-2.3.6
Closes: https://github.com/gentoo/gentoo/pull/7485

 x11-wm/i3/Manifest   |   1 +
 x11-wm/i3/i3-4.15.ebuild | 111 +++
 2 files changed, 112 insertions(+)

diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index 024f479e263..918f8f2a026 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -1,3 +1,4 @@
 DIST i3-4.13.tar.bz2 1121298 BLAKE2B 
94f3940406d43083c8dc577b4216a32a08ad4c4b58e7707cc9e3129038f4d13043c1f86e8de03d0fdfcff73f0de582fc8b3c88d71c0161ac3eefe28329f67a64
 SHA512 
1bb1044e8d86e78d3ccb79d49f0eb26665dcd05a348058a5e57138151d74f57d77830efc3025893170fe1b8ec612f739f75247a427410f96286b09afd2c5f14c
 DIST i3-4.14.1.tar.bz2 1173560 BLAKE2B 
96a0e1d75be13098fd530c3970464ce7710063f517c0d538939de6e7c799ab6b3ec005fb50216b1db4ccefd44584c584b263ac359bd9a86be53418d8f8d4beba
 SHA512 
ef628af002947b40e1c88b0e872c6e93d4377a9674a120bd9adc3f323a38570b05124cd3047b5a26659e72070de2d00d83fb93186510c74ad8ddbf4f3df85472
 DIST i3-4.14.tar.gz 3936748 BLAKE2B 
42678130be56bc695e5700e978ddbd34bfdaeda7a65252a05568581d76fe613e80e710f3a507110e7988077fe62048bf984d4009e722d877b178206cef600221
 SHA512 
fe3db78813987a15ed93d182968bcd5139e1d03f29d3e8effd9fce59f87bc8309407af0b2fa5f1cd83b8583e50ea0ade6b8eafc5dda6dea9161832dc9cebfdfe
+DIST i3-4.15.tar.bz2 1196263 BLAKE2B 
36f20327202957dba30aface91af4d2c6261979e726584712a508a11cb4a612d812e771dc9f28ec4cfcbf3ebc9d92c72f5e940048516cca0f185eab20f95ae32
 SHA512 
60ab61b7e380342126bea12fb4371f98fcf18f6435f79a9519d3f59cfabdb170634366036e1aa20c5592da0832b03140ad1f0c72bad3cfaace0b7c57ad01dfc4

diff --git a/x11-wm/i3/i3-4.15.ebuild b/x11-wm/i3/i3-4.15.ebuild
new file mode 100644
index 000..3c204ad407f
--- /dev/null
+++ b/x11-wm/i3/i3-4.15.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+AEVER=0.17
+
+inherit autotools out-of-source virtualx
+
+DESCRIPTION="An improved dynamic tiling window manager"
+HOMEPAGE="https://i3wm.org/;
+SRC_URI="https://i3wm.org/downloads/${P}.tar.bz2;
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc debug test"
+
+CDEPEND="dev-libs/libev
+   dev-libs/libpcre
+   >=dev-libs/yajl-2.0.3
+   x11-libs/libxcb[xkb]
+   x11-libs/libxkbcommon[X]
+   x11-libs/startup-notification
+   x11-libs/xcb-util
+   x11-libs/xcb-util-cursor
+   x11-libs/xcb-util-keysyms
+   x11-libs/xcb-util-wm
+   x11-libs/xcb-util-xrm
+   x11-misc/xkeyboard-config
+   >=x11-libs/cairo-1.14.4[X,xcb]
+   >=x11-libs/pango-1.30.0[X]"
+DEPEND="${CDEPEND}
+   app-text/asciidoc
+   doc? ( app-text/xmlto dev-lang/perl )
+   test? (
+   dev-perl/AnyEvent
+   >=dev-perl/X11-XCB-0.120.0
+   dev-perl/Inline
+   dev-perl/Inline-C
+   dev-perl/IPC-Run
+   dev-perl/ExtUtils-PkgConfig
+   dev-perl/local-lib
+   >=virtual/perl-Test-Simple-0.940.0
+   x11-base/xorg-server[xephyr]
+   )
+   virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+   dev-lang/perl
+   dev-perl/AnyEvent-I3
+   dev-perl/JSON-XS"
+
+# Test without debug will apply optimization levels, which results
+# in type-punned pointers - which in turn causes test failures.
+REQUIRED_USE="test? ( debug )"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-musl-GLOB_TILDE.patch"
+)
+
+# https://github.com/i3/i3/issues/3013
+RESTRICT="test"
+
+src_prepare() {
+   default
+
+   cat <<- EOF > "${T}"/i3wm
+   #!/bin/sh
+   exec /usr/bin/i3
+   EOF
+
+   eautoreconf
+}
+
+my_src_configure() {
+   local myeconfargs=(
+   $(use_enable debug)
+   )
+   econf "${myeconfargs[@]}"
+}
+
+my_src_test() {
+   emake \
+   test.commands_parser \
+   test.config_parser \
+   test.inject_randr15
+
+   virtx perl \
+   -I "${S}/testcases/lib" \
+   -I "${BUILD_DIR}/testcases/lib" \
+   testcases/complete-run.pl
+}
+
+my_src_install_all() {
+   doman man/*.1
+
+   einstalldocs
+   use doc && dodoc -r docs "RELEASE-NOTES-${PV}"
+
+   exeinto /etc/X11/Sessions
+   doexe "${T}/i3wm"
+}
+
+pkg_postinst() {
+   einfo "There are several packages that you may find useful with ${PN} 
and"
+   einfo "their usage is suggested by the upstream maintainers, namely:"
+   einfo "  x11-misc/dmenu"
+   einfo "  x11-misc/i3status"
+   einfo "  x11-misc/i3lock"
+   einfo "Please 

[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/

2018-02-14 Thread Michał Górny
commit: 4df6d49f6f74e5cc7a52d10341689df4f9c78489
Author: Nelo-T. Wallus  wallus  de>
AuthorDate: Wed Feb 14 17:43:42 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Feb 14 19:38:03 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4df6d49f

x11-wm/i3: Revert "add ~arm64, bug #640274"

Dependencies are not keyworded, see bug for details.

Bug: https://bugs.gentoo.org/640274
Closes: https://github.com/gentoo/gentoo/pull/7187
Reverts: 5bde02429fa44ae1d62e116b7ae008ec6b3babd0

 x11-wm/i3/i3-4.14.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/i3/i3-4.14.1.ebuild b/x11-wm/i3/i3-4.14.1.ebuild
index df485534f2f..3c204ad407f 100644
--- a/x11-wm/i3/i3-4.14.1.ebuild
+++ b/x11-wm/i3/i3-4.14.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://i3wm.org/downloads/${P}.tar.bz2;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc debug test"
 
 CDEPEND="dev-libs/libev



[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/

2018-02-11 Thread Michał Górny
commit: 90f04a88fe44d7f325ea09fbb40a071748f0023a
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Feb 11 11:21:45 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Feb 11 11:36:39 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90f04a88

x11-wm/i3: Remove useless maintainer 

Remove useless/redundant maintainer . It does not benefit
bug wrangling, and only wastes developer's time on reading it. Few tips:

- assignee/CC is implied by ordering, there is no reason to repeat it,
- we know that maintainer is maintainer (la la la la la),
- most of adjectives for maintainer are of no value and/or are obvious.

 x11-wm/i3/metadata.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/x11-wm/i3/metadata.xml b/x11-wm/i3/metadata.xml
index 1068c94323a..a37f96f2741 100644
--- a/x11-wm/i3/metadata.xml
+++ b/x11-wm/i3/metadata.xml
@@ -4,12 +4,10 @@

n...@wallus.de
Nelo-Thara Wallus
-   Proxied by Polynomial-C


polynomia...@gentoo.org
Lars Wendler
-   Proxy maintainer for Nelo


Build and install the HTML documentation and 
regenerate the man pages



[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/

2018-01-16 Thread Lars Wendler
commit: 4aedee4d20b325f1d3a3a0643d48978c0321a8c8
Author: Nelo-T. Wallus  wallus  de>
AuthorDate: Tue Jan 16 11:24:49 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Jan 16 11:29:00 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4aedee4d

x11-wm/i3: Readd my_src_test and restrict test phase

Package-Manager: Portage-2.3.19, Repoman-2.3.6
Closes: https://github.com/gentoo/gentoo/pull/6876

 x11-wm/i3/i3-4.14.1.ebuild | 17 -
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/x11-wm/i3/i3-4.14.1.ebuild b/x11-wm/i3/i3-4.14.1.ebuild
index c10aed5dc8d..df485534f2f 100644
--- a/x11-wm/i3/i3-4.14.1.ebuild
+++ b/x11-wm/i3/i3-4.14.1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 AEVER=0.17
 
-inherit autotools out-of-source
+inherit autotools out-of-source virtualx
 
 DESCRIPTION="An improved dynamic tiling window manager"
 HOMEPAGE="https://i3wm.org/;
@@ -58,6 +58,9 @@ PATCHES=(
"${FILESDIR}/${PN}-musl-GLOB_TILDE.patch"
 )
 
+# https://github.com/i3/i3/issues/3013
+RESTRICT="test"
+
 src_prepare() {
default
 
@@ -76,6 +79,18 @@ my_src_configure() {
econf "${myeconfargs[@]}"
 }
 
+my_src_test() {
+   emake \
+   test.commands_parser \
+   test.config_parser \
+   test.inject_randr15
+
+   virtx perl \
+   -I "${S}/testcases/lib" \
+   -I "${BUILD_DIR}/testcases/lib" \
+   testcases/complete-run.pl
+}
+
 my_src_install_all() {
doman man/*.1
 



[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/

2018-01-15 Thread Lars Wendler
commit: 30719c6475c2a7d3b5ef95ba5eb17eb60852f2b9
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Jan 16 00:02:58 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Jan 16 00:03:34 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30719c64

x11-wm/i3: Fixed issues from previous commit.

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 x11-wm/i3/i3-4.14.1.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/x11-wm/i3/i3-4.14.1.ebuild b/x11-wm/i3/i3-4.14.1.ebuild
index 73ad789867b..c10aed5dc8d 100644
--- a/x11-wm/i3/i3-4.14.1.ebuild
+++ b/x11-wm/i3/i3-4.14.1.ebuild
@@ -76,12 +76,11 @@ my_src_configure() {
econf "${myeconfargs[@]}"
 }
 
-my_src_install() {
-   emake install
+my_src_install_all() {
doman man/*.1
 
einstalldocs
-   use docs && dodoc -r docs "RELEASE-NOTES-${PV}"
+   use doc && dodoc -r docs "RELEASE-NOTES-${PV}"
 
exeinto /etc/X11/Sessions
doexe "${T}/i3wm"



[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/

2018-01-15 Thread Lars Wendler
commit: 8f74772e20fb2992a0fd19ec5b08fe09c7418908
Author: Nelo-T. Wallus  wallus  de>
AuthorDate: Mon Jan 15 20:00:51 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Jan 16 00:03:32 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f74772e

x11-wm/i3: Use out-of-source eclass

Package-Manager: Portage-2.3.19, Repoman-2.3.6
Closes: https://github.com/gentoo/gentoo/pull/6873

 x11-wm/i3/i3-4.14.1.ebuild | 39 +--
 1 file changed, 9 insertions(+), 30 deletions(-)

diff --git a/x11-wm/i3/i3-4.14.1.ebuild b/x11-wm/i3/i3-4.14.1.ebuild
index 1d884372499..73ad789867b 100644
--- a/x11-wm/i3/i3-4.14.1.ebuild
+++ b/x11-wm/i3/i3-4.14.1.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 AEVER=0.17
 
-inherit autotools virtualx
+inherit autotools out-of-source
 
 DESCRIPTION="An improved dynamic tiling window manager"
 HOMEPAGE="https://i3wm.org/;
 SRC_URI="https://i3wm.org/downloads/${P}.tar.bz2;
+
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
@@ -53,29 +54,10 @@ RDEPEND="${CDEPEND}
 # in type-punned pointers - which in turn causes test failures.
 REQUIRED_USE="test? ( debug )"
 
-DOCS=(
-   "RELEASE-NOTES-${PV}"
-   docs
-)
 PATCHES=(
"${FILESDIR}/${PN}-musl-GLOB_TILDE.patch"
 )
 
-# https://github.com/i3/i3/issues/3013
-RESTRICT="test"
-
-src_test() {
-   emake -C "${CBUILD}" \
-   test.commands_parser \
-   test.config_parser \
-   test.inject_randr15
-
-   virtx perl \
-   -I "${S}/testcases/lib" \
-   -I "${CBUILD}/testcases/lib" \
-   "${CBUILD}/testcases/complete-run.pl"
-}
-
 src_prepare() {
default
 
@@ -87,22 +69,19 @@ src_prepare() {
eautoreconf
 }
 
-src_configure() {
+my_src_configure() {
local myeconfargs=(
$(use_enable debug)
)
econf "${myeconfargs[@]}"
 }
 
-src_compile() {
-   emake -C "${CBUILD}"
-}
-
-src_install() {
-   emake -C "${CBUILD}" DESTDIR="${D}" install
-   doman "${S}"/man/*.1
+my_src_install() {
+   emake install
+   doman man/*.1
 
-   use doc && einstalldocs
+   einstalldocs
+   use docs && dodoc -r docs "RELEASE-NOTES-${PV}"
 
exeinto /etc/X11/Sessions
doexe "${T}/i3wm"



[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/

2017-12-24 Thread Markus Meier
commit: 5bde02429fa44ae1d62e116b7ae008ec6b3babd0
Author: Markus Meier  gentoo  org>
AuthorDate: Sun Dec 24 12:00:17 2017 +
Commit: Markus Meier  gentoo  org>
CommitDate: Sun Dec 24 12:00:17 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bde0242

x11-wm/i3: add ~arm64, bug #640274

Package-Manager: Portage-2.3.13, Repoman-2.3.3
RepoMan-Options: --include-arches="arm64"

 x11-wm/i3/i3-4.14.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/i3/i3-4.14.1.ebuild b/x11-wm/i3/i3-4.14.1.ebuild
index a79166c8080..1d884372499 100644
--- a/x11-wm/i3/i3-4.14.1.ebuild
+++ b/x11-wm/i3/i3-4.14.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://i3wm.org/;
 SRC_URI="https://i3wm.org/downloads/${P}.tar.bz2;
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="doc debug test"
 
 CDEPEND="dev-libs/libev



[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/

2017-11-29 Thread Lars Wendler
commit: 587fc050f53f695dda640aa4453953b9eec15255
Author: Nelo-T. Wallus  wallus  de>
AuthorDate: Mon Nov 27 17:29:57 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Nov 29 19:27:41 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=587fc050

x11-wm/i3: Add missing dependency xkeyboard-config

Dependency wasn't noticed as it is a depend of xorg-server.

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

Package-Manager: Portage-2.3.16, Repoman-2.3.6
Closes: https://github.com/gentoo/gentoo/pull/6321

 x11-wm/i3/Manifest | 6 +++---
 x11-wm/i3/i3-4.14.1.ebuild | 1 +
 x11-wm/i3/i3-.ebuild   | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index 312a27d4fac..024f479e263 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -1,3 +1,3 @@
-DIST i3-4.13.tar.bz2 1121298 SHA256 
94c13183e527a984132a3b050c8bf629626502a6e133e07b413641aec5f8cf8a SHA512 
1bb1044e8d86e78d3ccb79d49f0eb26665dcd05a348058a5e57138151d74f57d77830efc3025893170fe1b8ec612f739f75247a427410f96286b09afd2c5f14c
 WHIRLPOOL 
c0e9b205837e30d214d525af6ceb8adcc4cbbba42d9aa0eab4e7639cbd8884d827c5783590eb23a6790e8d8d87fb81884afa369e48a7ae474613392dc6f9b371
-DIST i3-4.14.1.tar.bz2 1173560 SHA256 
d0063ac561f3aa8d7e31e137356815bad781bd6ad774030362c89abe96ab5fb1 SHA512 
ef628af002947b40e1c88b0e872c6e93d4377a9674a120bd9adc3f323a38570b05124cd3047b5a26659e72070de2d00d83fb93186510c74ad8ddbf4f3df85472
 WHIRLPOOL 
95bfc65c2ff172121ed4091efc5d6d770eafe1e53189018335b048363e669c02a5221dfecece70d2c357de41cb8a42f19bca8b46a45e1a423a1e20741c8b855d
-DIST i3-4.14.tar.gz 3936748 SHA256 
6807a578275be936289986a77f77320e1581dad9e752f2fc7c443b6aeaa0d14c SHA512 
fe3db78813987a15ed93d182968bcd5139e1d03f29d3e8effd9fce59f87bc8309407af0b2fa5f1cd83b8583e50ea0ade6b8eafc5dda6dea9161832dc9cebfdfe
 WHIRLPOOL 
57aa268c52a4271a6170042c31b8e4cba82486ffce96981c96a305e2d7c613f2abc6e5f395c598fc93acfffdf34d45c8f131b79deedc2d2fc7cb5d1dd5ae2499
+DIST i3-4.13.tar.bz2 1121298 BLAKE2B 
94f3940406d43083c8dc577b4216a32a08ad4c4b58e7707cc9e3129038f4d13043c1f86e8de03d0fdfcff73f0de582fc8b3c88d71c0161ac3eefe28329f67a64
 SHA512 
1bb1044e8d86e78d3ccb79d49f0eb26665dcd05a348058a5e57138151d74f57d77830efc3025893170fe1b8ec612f739f75247a427410f96286b09afd2c5f14c
+DIST i3-4.14.1.tar.bz2 1173560 BLAKE2B 
96a0e1d75be13098fd530c3970464ce7710063f517c0d538939de6e7c799ab6b3ec005fb50216b1db4ccefd44584c584b263ac359bd9a86be53418d8f8d4beba
 SHA512 
ef628af002947b40e1c88b0e872c6e93d4377a9674a120bd9adc3f323a38570b05124cd3047b5a26659e72070de2d00d83fb93186510c74ad8ddbf4f3df85472
+DIST i3-4.14.tar.gz 3936748 BLAKE2B 
42678130be56bc695e5700e978ddbd34bfdaeda7a65252a05568581d76fe613e80e710f3a507110e7988077fe62048bf984d4009e722d877b178206cef600221
 SHA512 
fe3db78813987a15ed93d182968bcd5139e1d03f29d3e8effd9fce59f87bc8309407af0b2fa5f1cd83b8583e50ea0ade6b8eafc5dda6dea9161832dc9cebfdfe

diff --git a/x11-wm/i3/i3-4.14.1.ebuild b/x11-wm/i3/i3-4.14.1.ebuild
index 41be551dcce..a79166c8080 100644
--- a/x11-wm/i3/i3-4.14.1.ebuild
+++ b/x11-wm/i3/i3-4.14.1.ebuild
@@ -26,6 +26,7 @@ CDEPEND="dev-libs/libev
x11-libs/xcb-util-keysyms
x11-libs/xcb-util-wm
x11-libs/xcb-util-xrm
+   x11-misc/xkeyboard-config
>=x11-libs/cairo-1.14.4[X,xcb]
>=x11-libs/pango-1.30.0[X]"
 DEPEND="${CDEPEND}

diff --git a/x11-wm/i3/i3-.ebuild b/x11-wm/i3/i3-.ebuild
index 1775d348c34..cd758177621 100644
--- a/x11-wm/i3/i3-.ebuild
+++ b/x11-wm/i3/i3-.ebuild
@@ -27,6 +27,7 @@ CDEPEND="dev-libs/libev
x11-libs/xcb-util-keysyms
x11-libs/xcb-util-wm
x11-libs/xcb-util-xrm
+   x11-misc/xkeyboard-config
>=x11-libs/cairo-1.14.4[X,xcb]
>=x11-libs/pango-1.30.0[X]"
 DEPEND="${CDEPEND}



[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/

2017-10-18 Thread Lars Wendler
commit: 0d3dfb7dad213fb1193cc42cfea044933d9c9b4f
Author: Nelo-T. Wallus  wallus  de>
AuthorDate: Sun Oct 15 00:38:17 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Oct 18 06:02:29 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d3dfb7d

x11-wm/i3: Fix dependency on virtualx deps and source of man pages

For 4.14 the VCS tarball had to be used, which doesn't contain the man
pages, after switching back to the dist tarballs for 4.14.1 install
source of man pages wasn't updated.
https://bugs.gentoo.org/634282

The virtualx eclass was set to always add the dependencies, which was
left over from debugging.
https://github.com/gentoo/gentoo/pull/5879#issuecomment-336597437

Package-Manager: Portage-2.3.11, Repoman-2.3.3
Closes: https://github.com/gentoo/gentoo/pull/5947

 x11-wm/i3/i3-4.14.1.ebuild | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/x11-wm/i3/i3-4.14.1.ebuild b/x11-wm/i3/i3-4.14.1.ebuild
index bd58f0a26c7..41be551dcce 100644
--- a/x11-wm/i3/i3-4.14.1.ebuild
+++ b/x11-wm/i3/i3-4.14.1.ebuild
@@ -5,8 +5,6 @@ EAPI=6
 
 AEVER=0.17
 
-VIRTUALX_REQUIRED=always
-
 inherit autotools virtualx
 
 DESCRIPTION="An improved dynamic tiling window manager"
@@ -101,7 +99,7 @@ src_compile() {
 
 src_install() {
emake -C "${CBUILD}" DESTDIR="${D}" install
-   doman "${CBUILD}"/man/*.1
+   doman "${S}"/man/*.1
 
use doc && einstalldocs
 



[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/

2017-10-13 Thread Lars Wendler
commit: 3af8a51ed3bd9387b17b387c59f6ce81606a83ad
Author: Nelo-T. Wallus  wallus  de>
AuthorDate: Sat Oct  7 06:25:26 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Oct 13 09:27:34 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3af8a51e

x11-wm/i3: Bump version to 4.14.1

Package-Manager: Portage-2.3.11, Repoman-2.3.3
Closes: https://github.com/gentoo/gentoo/pull/5879

 x11-wm/i3/Manifest |   1 +
 x11-wm/i3/i3-4.14.1.ebuild | 119 +
 2 files changed, 120 insertions(+)

diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index 8329aa932cd..312a27d4fac 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -1,2 +1,3 @@
 DIST i3-4.13.tar.bz2 1121298 SHA256 
94c13183e527a984132a3b050c8bf629626502a6e133e07b413641aec5f8cf8a SHA512 
1bb1044e8d86e78d3ccb79d49f0eb26665dcd05a348058a5e57138151d74f57d77830efc3025893170fe1b8ec612f739f75247a427410f96286b09afd2c5f14c
 WHIRLPOOL 
c0e9b205837e30d214d525af6ceb8adcc4cbbba42d9aa0eab4e7639cbd8884d827c5783590eb23a6790e8d8d87fb81884afa369e48a7ae474613392dc6f9b371
+DIST i3-4.14.1.tar.bz2 1173560 SHA256 
d0063ac561f3aa8d7e31e137356815bad781bd6ad774030362c89abe96ab5fb1 SHA512 
ef628af002947b40e1c88b0e872c6e93d4377a9674a120bd9adc3f323a38570b05124cd3047b5a26659e72070de2d00d83fb93186510c74ad8ddbf4f3df85472
 WHIRLPOOL 
95bfc65c2ff172121ed4091efc5d6d770eafe1e53189018335b048363e669c02a5221dfecece70d2c357de41cb8a42f19bca8b46a45e1a423a1e20741c8b855d
 DIST i3-4.14.tar.gz 3936748 SHA256 
6807a578275be936289986a77f77320e1581dad9e752f2fc7c443b6aeaa0d14c SHA512 
fe3db78813987a15ed93d182968bcd5139e1d03f29d3e8effd9fce59f87bc8309407af0b2fa5f1cd83b8583e50ea0ade6b8eafc5dda6dea9161832dc9cebfdfe
 WHIRLPOOL 
57aa268c52a4271a6170042c31b8e4cba82486ffce96981c96a305e2d7c613f2abc6e5f395c598fc93acfffdf34d45c8f131b79deedc2d2fc7cb5d1dd5ae2499

diff --git a/x11-wm/i3/i3-4.14.1.ebuild b/x11-wm/i3/i3-4.14.1.ebuild
new file mode 100644
index 000..bd58f0a26c7
--- /dev/null
+++ b/x11-wm/i3/i3-4.14.1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+AEVER=0.17
+
+VIRTUALX_REQUIRED=always
+
+inherit autotools virtualx
+
+DESCRIPTION="An improved dynamic tiling window manager"
+HOMEPAGE="https://i3wm.org/;
+SRC_URI="https://i3wm.org/downloads/${P}.tar.bz2;
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc debug test"
+
+CDEPEND="dev-libs/libev
+   dev-libs/libpcre
+   >=dev-libs/yajl-2.0.3
+   x11-libs/libxcb[xkb]
+   x11-libs/libxkbcommon[X]
+   x11-libs/startup-notification
+   x11-libs/xcb-util
+   x11-libs/xcb-util-cursor
+   x11-libs/xcb-util-keysyms
+   x11-libs/xcb-util-wm
+   x11-libs/xcb-util-xrm
+   >=x11-libs/cairo-1.14.4[X,xcb]
+   >=x11-libs/pango-1.30.0[X]"
+DEPEND="${CDEPEND}
+   app-text/asciidoc
+   doc? ( app-text/xmlto dev-lang/perl )
+   test? (
+   dev-perl/AnyEvent
+   >=dev-perl/X11-XCB-0.120.0
+   dev-perl/Inline
+   dev-perl/Inline-C
+   dev-perl/IPC-Run
+   dev-perl/ExtUtils-PkgConfig
+   dev-perl/local-lib
+   >=virtual/perl-Test-Simple-0.940.0
+   x11-base/xorg-server[xephyr]
+   )
+   virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+   dev-lang/perl
+   dev-perl/AnyEvent-I3
+   dev-perl/JSON-XS"
+
+# Test without debug will apply optimization levels, which results
+# in type-punned pointers - which in turn causes test failures.
+REQUIRED_USE="test? ( debug )"
+
+DOCS=(
+   "RELEASE-NOTES-${PV}"
+   docs
+)
+PATCHES=(
+   "${FILESDIR}/${PN}-musl-GLOB_TILDE.patch"
+)
+
+# https://github.com/i3/i3/issues/3013
+RESTRICT="test"
+
+src_test() {
+   emake -C "${CBUILD}" \
+   test.commands_parser \
+   test.config_parser \
+   test.inject_randr15
+
+   virtx perl \
+   -I "${S}/testcases/lib" \
+   -I "${CBUILD}/testcases/lib" \
+   "${CBUILD}/testcases/complete-run.pl"
+}
+
+src_prepare() {
+   default
+
+   cat <<- EOF > "${T}"/i3wm
+   #!/bin/sh
+   exec /usr/bin/i3
+   EOF
+
+   eautoreconf
+}
+
+src_configure() {
+   local myeconfargs=(
+   $(use_enable debug)
+   )
+   econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+   emake -C "${CBUILD}"
+}
+
+src_install() {
+   emake -C "${CBUILD}" DESTDIR="${D}" install
+   doman "${CBUILD}"/man/*.1
+
+   use doc && einstalldocs
+
+   exeinto /etc/X11/Sessions
+   doexe "${T}/i3wm"
+}
+
+pkg_postinst() {
+   einfo "There are several packages that you may find useful with ${PN} 
and"
+   einfo "their usage is suggested by the upstream maintainers, namely:"
+   einfo "  x11-misc/dmenu"
+   einfo "  x11-misc/i3status"
+   einfo "  x11-misc/i3lock"
+   

[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/

2017-09-13 Thread Lars Wendler
commit: ba299d312f5965dc8ef5e7f737b5ceabc4b63bfd
Author: Nelo-T. Wallus  wallus  de>
AuthorDate: Wed Sep 13 17:35:29 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Sep 13 19:22:32 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba299d31

x11-wm/i3: Bump version to 4.14

Package-Manager: Portage-2.3.8, Repoman-2.3.3
Closes: https://github.com/gentoo/gentoo/pull/5697

 x11-wm/i3/Manifest   |  1 +
 x11-wm/i3/i3-4.14.ebuild | 99 
 2 files changed, 100 insertions(+)

diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index 71328505cda..8329aa932cd 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -1 +1,2 @@
 DIST i3-4.13.tar.bz2 1121298 SHA256 
94c13183e527a984132a3b050c8bf629626502a6e133e07b413641aec5f8cf8a SHA512 
1bb1044e8d86e78d3ccb79d49f0eb26665dcd05a348058a5e57138151d74f57d77830efc3025893170fe1b8ec612f739f75247a427410f96286b09afd2c5f14c
 WHIRLPOOL 
c0e9b205837e30d214d525af6ceb8adcc4cbbba42d9aa0eab4e7639cbd8884d827c5783590eb23a6790e8d8d87fb81884afa369e48a7ae474613392dc6f9b371
+DIST i3-4.14.tar.gz 3936748 SHA256 
6807a578275be936289986a77f77320e1581dad9e752f2fc7c443b6aeaa0d14c SHA512 
fe3db78813987a15ed93d182968bcd5139e1d03f29d3e8effd9fce59f87bc8309407af0b2fa5f1cd83b8583e50ea0ade6b8eafc5dda6dea9161832dc9cebfdfe
 WHIRLPOOL 
57aa268c52a4271a6170042c31b8e4cba82486ffce96981c96a305e2d7c613f2abc6e5f395c598fc93acfffdf34d45c8f131b79deedc2d2fc7cb5d1dd5ae2499

diff --git a/x11-wm/i3/i3-4.14.ebuild b/x11-wm/i3/i3-4.14.ebuild
new file mode 100644
index 000..b98df36f927
--- /dev/null
+++ b/x11-wm/i3/i3-4.14.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="An improved dynamic tiling window manager"
+HOMEPAGE="https://i3wm.org/;
+# iw3m.org tarball for 4.14 is broken, see https://github.com/i3/i3/issues/2905
+SRC_URI="https://github.com/i3/i3/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc debug test"
+
+CDEPEND="dev-libs/libev
+   dev-libs/libpcre
+   >=dev-libs/yajl-2.0.3
+   x11-libs/libxcb[xkb]
+   x11-libs/libxkbcommon[X]
+   x11-libs/startup-notification
+   x11-libs/xcb-util
+   x11-libs/xcb-util-cursor
+   x11-libs/xcb-util-keysyms
+   x11-libs/xcb-util-wm
+   x11-libs/xcb-util-xrm
+   >=x11-libs/cairo-1.14.4[X,xcb]
+   >=x11-libs/pango-1.30.0[X]"
+DEPEND="${CDEPEND}
+   app-text/asciidoc
+   doc? ( app-text/xmlto dev-lang/perl )
+   test? (
+   dev-perl/Module-Install
+   )
+   virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+   dev-lang/perl
+   dev-perl/AnyEvent-I3
+   dev-perl/JSON-XS"
+
+# Test without debug will apply optimization levels, which results
+# in type-punned pointers - which in turn causes test failures.
+REQUIRED_USE="test? ( debug )"
+
+DOCS=(
+   "RELEASE-NOTES-${PV}"
+   docs
+)
+PATCHES=(
+   "${FILESDIR}/${PN}-musl-GLOB_TILDE.patch"
+)
+
+src_test() {
+   emake -C "${CBUILD}" check
+}
+
+src_prepare() {
+   default
+
+   cat <<- EOF > "${T}"/i3wm
+   #!/bin/sh
+   exec /usr/bin/i3
+   EOF
+
+   eautoreconf
+}
+
+src_configure() {
+   local myeconfargs=(
+   $(use_enable debug)
+   )
+   econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+   emake -C "${CBUILD}"
+}
+
+src_install() {
+   emake -C "${CBUILD}" DESTDIR="${D}" install
+   doman "${CBUILD}"/man/*.1
+
+   use doc && einstalldocs
+
+   exeinto /etc/X11/Sessions
+   doexe "${T}/i3wm"
+}
+
+pkg_postinst() {
+   einfo "There are several packages that you may find useful with ${PN} 
and"
+   einfo "their usage is suggested by the upstream maintainers, namely:"
+   einfo "  x11-misc/dmenu"
+   einfo "  x11-misc/i3status"
+   einfo "  x11-misc/i3lock"
+   einfo "Please refer to their description for additional info."
+}



[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/

2017-07-30 Thread Michał Górny
commit: 97ae0fe5102a568871af818d00f85c69d4f1fb8e
Author: David Hicks  hicks  id  au>
AuthorDate: Sat Jul 29 15:21:09 2017 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Jul 30 09:22:53 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97ae0fe5

x11-wm/i3: use HTTPS for GitHub, HOMEPAGE and SRC_URI

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 x11-wm/i3/i3-4.13-r1.ebuild | 4 ++--
 x11-wm/i3/i3-.ebuild| 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/x11-wm/i3/i3-4.13-r1.ebuild b/x11-wm/i3/i3-4.13-r1.ebuild
index 047df54a6e2..acfef3313c8 100644
--- a/x11-wm/i3/i3-4.13-r1.ebuild
+++ b/x11-wm/i3/i3-4.13-r1.ebuild
@@ -6,8 +6,8 @@ EAPI=6
 inherit autotools
 
 DESCRIPTION="An improved dynamic tiling window manager"
-HOMEPAGE="http://i3wm.org/;
-SRC_URI="http://i3wm.org/downloads/${P}.tar.bz2;
+HOMEPAGE="https://i3wm.org/;
+SRC_URI="https://i3wm.org/downloads/${P}.tar.bz2;
 
 LICENSE="BSD"
 SLOT="0"

diff --git a/x11-wm/i3/i3-.ebuild b/x11-wm/i3/i3-.ebuild
index 09c27735f9e..1775d348c34 100644
--- a/x11-wm/i3/i3-.ebuild
+++ b/x11-wm/i3/i3-.ebuild
@@ -6,9 +6,9 @@ EAPI=6
 inherit autotools git-r3
 
 DESCRIPTION="An improved dynamic tiling window manager"
-HOMEPAGE="http://i3wm.org/;
+HOMEPAGE="https://i3wm.org/;
 SRC_URI=""
-EGIT_REPO_URI="git://github.com/i3/i3"
+EGIT_REPO_URI="https://github.com/i3/i3;
 EGIT_BRANCH="next"
 
 LICENSE="BSD"



[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/, x11-wm/i3/files/

2017-07-28 Thread Lars Wendler
commit: a3dbdbc5eefa388846591a72ec6a48bfa2db82a9
Author: Nelo-T. Wallus  wallus  de>
AuthorDate: Thu Jul 13 19:17:15 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Jul 28 11:33:12 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3dbdbc5

x11-wm/i3: Add GLOB_TILDE patch for musl

Package-Manager: Portage-2.3.6, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/5230

 x11-wm/i3/files/i3-musl-GLOB_TILDE.patch | 86 
 x11-wm/i3/i3-4.13-r1.ebuild  |  1 +
 x11-wm/i3/i3-.ebuild |  6 ++-
 3 files changed, 92 insertions(+), 1 deletion(-)

diff --git a/x11-wm/i3/files/i3-musl-GLOB_TILDE.patch 
b/x11-wm/i3/files/i3-musl-GLOB_TILDE.patch
new file mode 100644
index 000..d241a748186
--- /dev/null
+++ b/x11-wm/i3/files/i3-musl-GLOB_TILDE.patch
@@ -0,0 +1,86 @@
+From: Natanael Copa 
+Patch-Source: 
https://git.alpinelinux.org/cgit/aports/tree/community/i3wm/musl.patch
+Project-Bug-URL: https://github.com/i3/i3/issues/1859
+Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=609306
+
+Musl doesn't implement GLOB_TILDE, which is used by i3 when expanding paths.
+
+This patch replaces usage of GLOB_TILDE in glob() by replacing tilde
+with the content of $HOME - if set - manually.
+
+As mentioned in the i3 bugtracker this is an issue that should be solved by 
musl.
+
+A patch has been sent to musl upstream, but it hasn't been merged yet:
+http://www.openwall.com/lists/musl/2017/01/17/1
+---
+--- i3-4.11/i3bar/src/main.c
 i3-4.11/i3bar/src/main.c
+@@ -45,14 +45,20 @@ void debuglog(char *fmt, ...) {
+  *
+  */
+ char *expand_path(char *path) {
+-static glob_t globbuf;
+-if (glob(path, GLOB_NOCHECK | GLOB_TILDE, NULL, ) < 0) {
+-ELOG("glob() failed\n");
+-exit(EXIT_FAILURE);
++char *home, *expanded;
++
++if (strncmp(path, "~/", 2) == 0) {
++home = getenv("HOME");
++if (home != NULL) {
++/* new length: sum - 1 (omit '~') + 1 (for '\0') */
++expanded = scalloc(strlen(home)+strlen(path), 1);
++strcpy(expanded, home);
++strcat(expanded, path+1);
++return expanded;
++}
+ }
+-char *result = sstrdup(globbuf.gl_pathc > 0 ? globbuf.gl_pathv[0] : path);
+-globfree();
+-return result;
++
++return sstrdup(path);
+ }
+
+ void print_usage(char *elf_name) {
+--- i3-4.11/libi3/resolve_tilde.c
 i3-4.11/libi3/resolve_tilde.c
+@@ -19,27 +19,18 @@
+  *
+  */
+ char *resolve_tilde(const char *path) {
+-static glob_t globbuf;
+-char *head, *tail, *result;
++char *home, *expanded;
+
+-tail = strchr(path, '/');
+-head = sstrndup(path, tail ? (size_t)(tail - path) : strlen(path));
+-
+-int res = glob(head, GLOB_TILDE, NULL, );
+-free(head);
+-/* no match, or many wildcard matches are bad */
+-if (res == GLOB_NOMATCH || globbuf.gl_pathc != 1)
+-result = sstrdup(path);
+-else if (res != 0) {
+-err(EXIT_FAILURE, "glob() failed");
+-} else {
+-head = globbuf.gl_pathv[0];
+-result = scalloc(strlen(head) + (tail ? strlen(tail) : 0) + 1, 1);
+-strncpy(result, head, strlen(head));
+-if (tail)
+-strncat(result, tail, strlen(tail));
++if (strncmp(path, "~/", 2) == 0) {
++home = getenv("HOME");
++if (home != NULL) {
++/* new length: sum - 1 (omit '~') + 1 (for '\0') */
++expanded = scalloc(strlen(home)+strlen(path), 1);
++strcpy(expanded, home);
++strcat(expanded, path+1);
++return expanded;
++}
+ }
+-globfree();
+
+-return result;
++return sstrdup(path);
+ }

diff --git a/x11-wm/i3/i3-4.13-r1.ebuild b/x11-wm/i3/i3-4.13-r1.ebuild
index 2311d42860a..047df54a6e2 100644
--- a/x11-wm/i3/i3-4.13-r1.ebuild
+++ b/x11-wm/i3/i3-4.13-r1.ebuild
@@ -38,6 +38,7 @@ RDEPEND="${CDEPEND}
 DOCS=( RELEASE-NOTES-${PV} )
 PATCHES=(
"${FILESDIR}/${P}-remove-git-polling.patch"
+   "${FILESDIR}/${PN}-musl-GLOB_TILDE.patch"
 )
 
 src_prepare() {

diff --git a/x11-wm/i3/i3-.ebuild b/x11-wm/i3/i3-.ebuild
index 1e6ce9e0da2..09c27735f9e 100644
--- a/x11-wm/i3/i3-.ebuild
+++ b/x11-wm/i3/i3-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -37,6 +37,10 @@ RDEPEND="${CDEPEND}
dev-perl/AnyEvent-I3
dev-perl/JSON-XS"
 
+PATCHES=(
+   "${FILESDIR}/${PN}-musl-GLOB_TILDE.patch"
+)
+
 src_prepare() {
default
 



[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/

2017-07-13 Thread Lars Wendler
commit: fb467f9036e45a35199301b86584c524e8071894
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Jul 13 06:42:54 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Jul 13 06:43:09 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb467f90

x11-wm/i3: Added Nelo as proxy maintainer (bug #624754).

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 x11-wm/i3/metadata.xml | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/x11-wm/i3/metadata.xml b/x11-wm/i3/metadata.xml
index 8e610023efc..1068c94323a 100644
--- a/x11-wm/i3/metadata.xml
+++ b/x11-wm/i3/metadata.xml
@@ -1,6 +1,16 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
+   
+   n...@wallus.de
+   Nelo-Thara Wallus
+   Proxied by Polynomial-C
+   
+   
+   polynomia...@gentoo.org
+   Lars Wendler
+   Proxy maintainer for Nelo
+   

Build and install the HTML documentation and 
regenerate the man pages




[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/files/, x11-wm/i3/

2017-06-23 Thread Michael Palimaka
commit: f12553dc4d9f7aaa62a11fbabf7a40e0cfab4be1
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sat Jun 24 02:04:54 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Jun 24 02:05:00 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f12553dc

x11-wm/i3: remove old

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 x11-wm/i3/Manifest  |   5 -
 x11-wm/i3/files/i3-4.12-pango.patch | 181 
 x11-wm/i3/i3-4.10.4.ebuild  |  72 --
 x11-wm/i3/i3-4.11.ebuild|  72 --
 x11-wm/i3/i3-4.12.ebuild|  85 -
 x11-wm/i3/i3-4.8.ebuild |  72 --
 x11-wm/i3/i3-4.9.1.ebuild   |  72 --
 x11-wm/i3/metadata.xml  |   1 -
 8 files changed, 560 deletions(-)

diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index 9d7b49af5ca..71328505cda 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -1,6 +1 @@
-DIST i3-4.10.4.tar.bz2 940744 SHA256 
dd4fa7a5c5b8feaf83f196fc181bfd33aff65c11d81c91b3ae9d9d3d2540655e SHA512 
e777d1ca8ebeada185dfe11443a8b731cb72b6f836a0848e24291ea5d70e4b6d6c414acd58c156be97bd90d07ba4019a713cdb406a24fda33afeae08ceb6ed18
 WHIRLPOOL 
5bfaeb74d8f1c3dc10719bcac56087d7716e0a7a6c251495db256af1d1342eea3baae4b5c4f6c8131efa89393016c0dd0a56b17ff1f7bd757185dbf4747e7441
-DIST i3-4.11.tar.bz2 972929 SHA256 
78ce1e06fbd92fd63765bbe23faa7b8f929c17f99ed623f7abf2e568169d982f SHA512 
76d45be9006973dd4093fd21ea1c83742b7977c7698e133ce8f9e7826d97d1631fbe6c3ea4a7eb3d989027f98e12738158e72ec450b0df328f912ff49a4f
 WHIRLPOOL 
f3bff5c0386ad09c5cabb25c7ccb14033f1a7ba3ee19fcc832739cbc61a31f84d3a57418264db4728fbb406c24464a8c87cbfde1e651599a3b63d87eb0af11cb
-DIST i3-4.12.tar.bz2 988084 SHA256 
e19e1ce08c2549cba83e083cc768d487202c41760d5c283f67752e791f1d78b4 SHA512 
966f62dbd82c6c70d1344cc61f14f154f3f649ce1b5a5b5168f00f50d598582ef26f5bd5496ea62e13213e45b1c7043f6209c94fcbefe2947fec63284445c1f5
 WHIRLPOOL 
7cf414de6d375029328edc8d824d2542ccae99ddf48eac9a563e81e0e86db5506f45f851d5af755ebfe8514e9afb5f8394d962fb191f4b0ab4268a81b8397395
 DIST i3-4.13.tar.bz2 1121298 SHA256 
94c13183e527a984132a3b050c8bf629626502a6e133e07b413641aec5f8cf8a SHA512 
1bb1044e8d86e78d3ccb79d49f0eb26665dcd05a348058a5e57138151d74f57d77830efc3025893170fe1b8ec612f739f75247a427410f96286b09afd2c5f14c
 WHIRLPOOL 
c0e9b205837e30d214d525af6ceb8adcc4cbbba42d9aa0eab4e7639cbd8884d827c5783590eb23a6790e8d8d87fb81884afa369e48a7ae474613392dc6f9b371
-DIST i3-4.8.tar.bz2 939690 SHA256 
502c34290f239780bb40352191f0500e8f35d2446eddb573c67c27873d6a1b6b SHA512 
fd6f92da857246119f1ae710b6c5168128fa2da5eae8308550b1b9c75879f060cac8246897333f3d67e18de36828a11dd12b4ccee9bd6cd6ad32e2b44c50b43e
 WHIRLPOOL 
6c6288cb66ffdbf225df0dfcdc4f540cd36d7c8333a9f9d9c363cb6580d6a7c1ca0deb227a8f46ac907f2afc6e4e46efc448a51f0764a167bb9639956beae4ef
-DIST i3-4.9.1.tar.bz2 939630 SHA256 
b70deff027c7d05276c9646e53faeeeccdde706370b9b337a633bed85b16dc43 SHA512 
7a8f71dd944faae426a2239b8bf12ea1cfc83a95c49fcb64ded8321ef302f3277af7d2ecd84d99cef47aba73e5a1091f94e37e9ed2af78c4722ffee507477c90
 WHIRLPOOL 
15cd2722beaeef642815edd44ff189ff0d003fefbff71c067b94a65dadb55cd15dd1a142a37499fa55cc80424dbdc74cb979c8998d740addcc492eaf025e467f

diff --git a/x11-wm/i3/files/i3-4.12-pango.patch 
b/x11-wm/i3/files/i3-4.12-pango.patch
deleted file mode 100644
index 6442796cae7..000
--- a/x11-wm/i3/files/i3-4.12-pango.patch
+++ /dev/null
@@ -1,181 +0,0 @@
-Fixes builds with without pango/cairo
-
-https://github.com/i3/i3/pull/2243
-https://bugs.gentoo.org/show_bug.cgi?id=576664
-
 a/include/libi3.h
-+++ b/include/libi3.h
-@@ -20,7 +20,7 @@
- #if PANGO_SUPPORT
- #include 
- #endif
--#ifdef CAIRO_SUPPORT
-+#if CAIRO_SUPPORT
- #include 
- #endif
- 
-@@ -518,7 +518,7 @@ typedef struct placeholder_t {
-  */
- char *format_placeholders(char *format, placeholder_t *placeholders, int num);
- 
--#ifdef CAIRO_SUPPORT
-+#if CAIRO_SUPPORT
- /* We need to flush cairo surfaces twice to avoid an assertion bug. See #1989
-  * and https://bugs.freedesktop.org/show_bug.cgi?id=92455. */
- #define CAIRO_SURFACE_FLUSH(surface)  \
-@@ -542,7 +542,7 @@ typedef struct surface_t {
- int width;
- int height;
- 
--#ifdef CAIRO_SUPPORT
-+#if CAIRO_SUPPORT
- /* A cairo surface representing the drawable. */
- cairo_surface_t *surface;
- 
 a/libi3/draw_util.c
-+++ b/libi3/draw_util.c
-@@ -11,7 +11,7 @@
- #include 
- #include 
- #include 
--#ifdef CAIRO_SUPPORT
-+#if CAIRO_SUPPORT
- #include 
- #endif
- 
-@@ -50,7 +50,7 @@ void draw_util_surface_init(xcb_connection_t *conn, 
surface_t *surface, xcb_draw
- ELOG("Could not create graphical context. Error code: %d. Please 
report this bug.\n", error->error_code);
- }
- 
--#ifdef CAIRO_SUPPORT
-+#if CAIRO_SUPPORT
- surface->surface = cairo_xcb_surface_create(conn, surface->id, 
surface->visual_type, width, height);
- surface->cr = 

[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/

2017-06-20 Thread Pacho Ramos
commit: 0f0005e02e95eb2c6ddde25575d204134e09a3ca
Author: Pacho Ramos  gentoo  org>
AuthorDate: Tue Jun 20 12:43:29 2017 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Tue Jun 20 12:53:35 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f0005e0

x11-wm/i3: Cleanup metadata due to retirement

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 x11-wm/i3/metadata.xml | 4 
 1 file changed, 4 deletions(-)

diff --git a/x11-wm/i3/metadata.xml b/x11-wm/i3/metadata.xml
index e2200808c61..b5e30d37607 100644
--- a/x11-wm/i3/metadata.xml
+++ b/x11-wm/i3/metadata.xml
@@ -1,10 +1,6 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-   
-   xarthis...@gentoo.org
-   Kacper Kowalik
-   

Use x11-libs/pango to render text 
in order to support fonts which have more glyphs (e.g. Kanji). See 
RELEASE-NOTES for more information
Build and install the HTML documentation and 
regenerate the man pages



[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/, x11-wm/i3/files/

2017-05-08 Thread Michał Górny
commit: cacee360e28112a11456d7fd70b964f3016fb26f
Author: tharvik  users  noreply  github  com>
AuthorDate: Fri Jan 13 12:49:35 2017 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon May  8 20:01:00 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cacee360

x11-wm/i3: remove git polling

Closes: https://github.com/gentoo/gentoo/pull/3450
Package-Manager: portage-2.3.0

 x11-wm/i3/files/i3-4.13-remove-git-polling.patch | 19 +++
 x11-wm/i3/i3-4.13-r1.ebuild  |  3 +++
 2 files changed, 22 insertions(+)

diff --git a/x11-wm/i3/files/i3-4.13-remove-git-polling.patch 
b/x11-wm/i3/files/i3-4.13-remove-git-polling.patch
new file mode 100644
index 000..ca226378ed7
--- /dev/null
+++ b/x11-wm/i3/files/i3-4.13-remove-git-polling.patch
@@ -0,0 +1,19 @@
+diff -Naur a/configure.ac b/configure.ac
+--- a/configure.ac 2017-01-13 13:31:25.250216293 +0100
 b/configure.ac 2017-01-13 13:31:55.930217956 +0100
+@@ -146,15 +146,6 @@
+   print_BUILD_MANS=no
+ fi
+ 
+-git_dir=`git rev-parse --git-dir 2>/dev/null`
+-if test -n "$git_dir"; then
+-  srcdir=`dirname "$git_dir"`
+-  exclude_dir=`pwd | sed "s,^$srcdir,,g"`
+-  if ! grep -q "^$exclude_dir" "$git_dir/info/exclude"; then
+-  echo "$exclude_dir" >> "$git_dir/info/exclude"
+-  fi
+-fi
+-
+ echo \
+ 
"
+ build configured:

diff --git a/x11-wm/i3/i3-4.13-r1.ebuild b/x11-wm/i3/i3-4.13-r1.ebuild
index bcdf6f235b6..2311d42860a 100644
--- a/x11-wm/i3/i3-4.13-r1.ebuild
+++ b/x11-wm/i3/i3-4.13-r1.ebuild
@@ -36,6 +36,9 @@ RDEPEND="${CDEPEND}
dev-perl/JSON-XS"
 
 DOCS=( RELEASE-NOTES-${PV} )
+PATCHES=(
+   "${FILESDIR}/${P}-remove-git-polling.patch"
+)
 
 src_prepare() {
default



[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/

2017-02-25 Thread Markus Meier
commit: 090d81516ae02c28d9ddd27276953f3502dec2b5
Author: Markus Meier  gentoo  org>
AuthorDate: Sat Feb 25 14:23:37 2017 +
Commit: Markus Meier  gentoo  org>
CommitDate: Sat Feb 25 14:23:37 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=090d8151

x11-wm/i3: add ~arm, bug #599402

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --include-arches="arm"

 x11-wm/i3/i3-4.13-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/i3/i3-4.13-r1.ebuild b/x11-wm/i3/i3-4.13-r1.ebuild
index 1c230d7689..1554c7b845 100644
--- a/x11-wm/i3/i3-4.13-r1.ebuild
+++ b/x11-wm/i3/i3-4.13-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://i3wm.org/downloads/${P}.tar.bz2;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="doc"
 
 CDEPEND="dev-libs/libev



[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/files/

2017-02-18 Thread David Seifert
commit: 163219191179b1453217963b796b6850ef1df78b
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Sat Feb 18 15:47:07 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb 18 22:08:59 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16321919

x11-wm/i3: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/4024

 x11-wm/i3/files/i3-4.6-missing_include.patch | 15 --
 x11-wm/i3/files/i3-4.7.2-cflags.patch| 16 --
 x11-wm/i3/files/i3-4.7.2-parallel_make.patch | 45 
 3 files changed, 76 deletions(-)

diff --git a/x11-wm/i3/files/i3-4.6-missing_include.patch 
b/x11-wm/i3/files/i3-4.6-missing_include.patch
deleted file mode 100644
index 77147d264e..00
--- a/x11-wm/i3/files/i3-4.6-missing_include.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Include float.h for DBL_EPSILON
-
-https://bugs.gentoo.org/show_bug.cgi?id=480272
-
-Patch was written by Jeroen Roovers 
 a/src/handlers.c
-+++ b/src/handlers.c
-@@ -13,6 +13,7 @@
- #include "all.h"
- 
- #include 
-+#include 
- #include 
- #include 
- #include 

diff --git a/x11-wm/i3/files/i3-4.7.2-cflags.patch 
b/x11-wm/i3/files/i3-4.7.2-cflags.patch
deleted file mode 100644
index ed9256f441..00
--- a/x11-wm/i3/files/i3-4.7.2-cflags.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Respect CFLAGS in linking command
-
-https://bugs.gentoo.org/show_bug.cgi?id=508426
-
-Patch written by Julian Ospald 
 a/src/i3.mk
-+++ b/src/i3.mk
-@@ -64,7 +64,7 @@ i3-config-parser.stamp: generate-command-parser.pl 
parser-specs/config.spec
- 
- i3: libi3.a $(i3_OBJECTS)
-   echo "[i3] Link i3"
--  $(CC) $(I3_LDFLAGS) $(LDFLAGS) -o $@ $(filter-out libi3.a,$^) $(LIBS) 
$(i3_LIBS)
-+  $(CC) $(CFLAGS) $(I3_LDFLAGS) $(LDFLAGS) -o $@ $(filter-out libi3.a,$^) 
$(LIBS) $(i3_LIBS)
- 
- install-i3: i3
-   echo "[i3] Install"

diff --git a/x11-wm/i3/files/i3-4.7.2-parallel_make.patch 
b/x11-wm/i3/files/i3-4.7.2-parallel_make.patch
deleted file mode 100644
index 8e6eee75a9..00
--- a/x11-wm/i3/files/i3-4.7.2-parallel_make.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Fix parallel build
-
-https://bugs.gentoo.org/show_bug.cgi?id=508304
-
-Patch written by Julian Ospald 
-
 a/src/i3.mk
-+++ b/src/i3.mk
-@@ -1,4 +1,4 @@
--ALL_TARGETS += i3
-+ALL_TARGETS += i3 test-tools
- INSTALL_TARGETS += install-i3
- CLEAN_TARGETS += clean-i3
- 
-@@ -36,20 +36,22 @@ src/%.o: src/%.c $(i3_HEADERS_DEP)
-   echo "[i3] CC $<"
-   $(CC) $(I3_CPPFLAGS) $(XCB_CPPFLAGS) $(CPPFLAGS) $(i3_CFLAGS) 
$(I3_CFLAGS) $(CFLAGS) $(PCH_FLAGS) -c -o $@ ${canonical_path}/$<
- 
--# This target compiles the command parser twice:
--# Once with -DTEST_PARSER, creating a stand-alone executable used for tests,
--# and once as an object file for i3.
-+test-tools: src/test.commands_parser src/test.config_parser
-+
-+src/test.commands_parser: src/commands_parser.c $(i3_HEADERS_DEP) 
i3-command-parser.stamp libi3.a
-+  echo "[i3] Link test.commands_parser"
-+  $(CC) $(I3_CPPFLAGS) $(XCB_CPPFLAGS) $(CPPFLAGS) $(i3_CFLAGS) 
$(I3_CFLAGS) $(CFLAGS) $(I3_LDFLAGS) $(LDFLAGS) -DTEST_PARSER -g -o 
test.commands_parser $< $(LIBS) $(i3_LIBS)
-+
-+src/test.config_parser: src/config_parser.c $(i3_HEADERS_DEP) 
i3-config-parser.stamp libi3.a
-+  echo "[i3] Link test.config_parser"
-+  $(CC) $(I3_CPPFLAGS) $(XCB_CPPFLAGS) $(CPPFLAGS) $(i3_CFLAGS) 
$(I3_CFLAGS) $(CFLAGS) $(I3_LDFLAGS) $(LDFLAGS) -DTEST_PARSER -g -o 
test.config_parser $< $(LIBS) $(i3_LIBS)
-+
- src/commands_parser.o: src/commands_parser.c $(i3_HEADERS_DEP) 
i3-command-parser.stamp
-   echo "[i3] CC $<"
--  $(CC) $(I3_CPPFLAGS) $(XCB_CPPFLAGS) $(CPPFLAGS) $(i3_CFLAGS) 
$(I3_CFLAGS) $(CFLAGS) $(I3_LDFLAGS) $(LDFLAGS) -DTEST_PARSER -g -o 
test.commands_parser $< $(LIBS) $(i3_LIBS)
-   $(CC) $(I3_CPPFLAGS) $(XCB_CPPFLAGS) $(CPPFLAGS) $(i3_CFLAGS) 
$(I3_CFLAGS) $(CFLAGS) -c -o $@ ${canonical_path}/$<
- 
--# This target compiles the command parser twice:
--# Once with -DTEST_PARSER, creating a stand-alone executable used for tests,
--# and once as an object file for i3.
- src/config_parser.o: src/config_parser.c $(i3_HEADERS_DEP) 
i3-config-parser.stamp
-   echo "[i3] CC $<"
--  $(CC) $(I3_CPPFLAGS) $(XCB_CPPFLAGS) $(CPPFLAGS) $(i3_CFLAGS) 
$(I3_CFLAGS) $(CFLAGS) $(I3_LDFLAGS) $(LDFLAGS) -DTEST_PARSER -g -o 
test.config_parser $< $(LIBS) $(i3_LIBS)
-   $(CC) $(I3_CPPFLAGS) $(XCB_CPPFLAGS) $(CPPFLAGS) $(i3_CFLAGS) 
$(I3_CFLAGS) $(CFLAGS) -c -o $@ ${canonical_path}/$<
- 
- i3-command-parser.stamp: generate-command-parser.pl parser-specs/commands.spec



[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/

2017-01-11 Thread Agostino Sarubbo
commit: 38e812e67d6bf61e6937e62495c1d0924b7c2826
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jan 11 16:16:37 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jan 11 16:16:37 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38e812e6

x11-wm/i3: amd64 stable wrt bug #592316

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 x11-wm/i3/i3-4.13-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-wm/i3/i3-4.13-r1.ebuild b/x11-wm/i3/i3-4.13-r1.ebuild
index 429c49d..801046f 100644
--- a/x11-wm/i3/i3-4.13-r1.ebuild
+++ b/x11-wm/i3/i3-4.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -12,7 +12,7 @@ SRC_URI="http://i3wm.org/downloads/${P}.tar.bz2;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc"
 
 CDEPEND="dev-libs/libev



[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/

2016-11-10 Thread Kacper Kowalik
commit: 127e688918f5b729a7e714c4c32552826ba6f9a2
Author: Kacper Kowalik  gentoo  org>
AuthorDate: Thu Nov 10 14:24:19 2016 +
Commit: Kacper Kowalik  gentoo  org>
CommitDate: Thu Nov 10 14:24:46 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=127e6889

x11-wm/i3: synchronize deps between live ebuild and latest release

Fixes #599360

Reported-by: Patrick Lauer  gentoo.org>

Package-Manager: portage-2.3.2

 x11-wm/i3/i3-4.13-r1.ebuild |  7 ---
 x11-wm/i3/i3-.ebuild| 10 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/x11-wm/i3/i3-4.13-r1.ebuild b/x11-wm/i3/i3-4.13-r1.ebuild
index 470f0d4..429c49d 100644
--- a/x11-wm/i3/i3-4.13-r1.ebuild
+++ b/x11-wm/i3/i3-4.13-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://i3wm.org/downloads/${P}.tar.bz2;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
 CDEPEND="dev-libs/libev
@@ -25,11 +25,12 @@ CDEPEND="dev-libs/libev
x11-libs/xcb-util-cursor
x11-libs/xcb-util-keysyms
x11-libs/xcb-util-wm
+   x11-libs/xcb-util-xrm
>=x11-libs/cairo-1.14.4[X,xcb]
>=x11-libs/pango-1.30.0[X]"
 DEPEND="${CDEPEND}
-   virtual/pkgconfig
-   doc? ( app-text/asciidoc app-text/xmlto dev-lang/perl )"
+   doc? ( app-text/asciidoc app-text/xmlto dev-lang/perl )
+   virtual/pkgconfig"
 RDEPEND="${CDEPEND}
dev-lang/perl
dev-perl/AnyEvent-I3

diff --git a/x11-wm/i3/i3-.ebuild b/x11-wm/i3/i3-.ebuild
index bc86849..a8063e1 100644
--- a/x11-wm/i3/i3-.ebuild
+++ b/x11-wm/i3/i3-.ebuild
@@ -17,8 +17,7 @@ SLOT="0"
 KEYWORDS=""
 IUSE="doc"
 
-CDEPEND="dev-lang/perl
-   dev-libs/libev
+CDEPEND="dev-libs/libev
dev-libs/libpcre
>=dev-libs/yajl-2.0.3
x11-libs/libxcb[xkb]
@@ -29,12 +28,13 @@ CDEPEND="dev-lang/perl
x11-libs/xcb-util-keysyms
x11-libs/xcb-util-wm
x11-libs/xcb-util-xrm
-   >=x11-libs/pango-1.30.0[X]
-   >=x11-libs/cairo-1.14.4[X,xcb]"
+   >=x11-libs/cairo-1.14.4[X,xcb]
+   >=x11-libs/pango-1.30.0[X]"
 DEPEND="${CDEPEND}
-   doc? ( app-text/asciidoc app-text/xmlto )
+   doc? ( app-text/asciidoc app-text/xmlto dev-lang/perl )
virtual/pkgconfig"
 RDEPEND="${CDEPEND}
+   dev-lang/perl
dev-perl/AnyEvent-I3
dev-perl/JSON-XS"
 



[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/

2016-11-09 Thread Kacper Kowalik
commit: 2da0d337f7c5efc4a9baed233aade4119a058ae2
Author: Kacper Kowalik  gentoo  org>
AuthorDate: Wed Nov  9 23:26:44 2016 +
Commit: Kacper Kowalik  gentoo  org>
CommitDate: Wed Nov  9 23:26:44 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2da0d337

x11-wm/i3: fix metadata, thanks to dwfreed for catching this

Package-Manager: portage-2.3.2

 x11-wm/i3/metadata.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/x11-wm/i3/metadata.xml b/x11-wm/i3/metadata.xml
index b189c30..e220080 100644
--- a/x11-wm/i3/metadata.xml
+++ b/x11-wm/i3/metadata.xml
@@ -7,8 +7,6 @@


Use x11-libs/pango to render text 
in order to support fonts which have more glyphs (e.g. Kanji). See 
RELEASE-NOTES for more information
-   
-   
Build and install the HTML documentation and 
regenerate the man pages

 



[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/

2016-11-09 Thread Kacper Kowalik
commit: 2bb9e51568f12dd31bba9c947e5f1142054eda1f
Author: Kacper Kowalik  gentoo  org>
AuthorDate: Wed Nov  9 23:19:15 2016 +
Commit: Kacper Kowalik  gentoo  org>
CommitDate: Wed Nov  9 23:19:15 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bb9e515

x11-wm/i3: prevent injection of debug flags

Package-Manager: portage-2.2.28

 x11-wm/i3/{i3-4.13.ebuild => i3-4.13-r1.ebuild} |  9 +--
 x11-wm/i3/i3-.ebuild| 35 ++---
 2 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/x11-wm/i3/i3-4.13.ebuild b/x11-wm/i3/i3-4.13-r1.ebuild
similarity index 90%
rename from x11-wm/i3/i3-4.13.ebuild
rename to x11-wm/i3/i3-4.13-r1.ebuild
index 9e17c0b..470f0d4 100644
--- a/x11-wm/i3/i3-4.13.ebuild
+++ b/x11-wm/i3/i3-4.13-r1.ebuild
@@ -29,7 +29,7 @@ CDEPEND="dev-libs/libev
>=x11-libs/pango-1.30.0[X]"
 DEPEND="${CDEPEND}
virtual/pkgconfig
-   doc? ( app-text/asciidoc app-text/xmlto )"
+   doc? ( app-text/asciidoc app-text/xmlto dev-lang/perl )"
 RDEPEND="${CDEPEND}
dev-lang/perl
dev-perl/AnyEvent-I3
@@ -38,6 +38,7 @@ RDEPEND="${CDEPEND}
 DOCS=( RELEASE-NOTES-${PV} )
 
 src_prepare() {
+   default
if ! use doc ; then
sed -e '/AC_PATH_PROG(\[PATH_ASCIIDOC/d' -i configure.ac || die
eautoreconf
@@ -46,7 +47,11 @@ src_prepare() {
#!/bin/sh
exec /usr/bin/i3
EOF
-   default
+}
+
+src_configure() {
+   local myeconfargs=( --enable-debug=no )  # otherwise injects -O0 -g
+   econf "${myeconfargs[@]}"
 }
 
 src_compile() {

diff --git a/x11-wm/i3/i3-.ebuild b/x11-wm/i3/i3-.ebuild
index 03b4ef6..f1ac47a 100644
--- a/x11-wm/i3/i3-.ebuild
+++ b/x11-wm/i3/i3-.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-inherit eutils toolchain-funcs git-2
+inherit autotools git-r3
 
 DESCRIPTION="An improved dynamic tiling window manager"
 HOMEPAGE="http://i3wm.org/;
@@ -15,7 +15,7 @@ EGIT_BRANCH="next"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS=""
-IUSE="+pango"
+IUSE="doc"
 
 CDEPEND="dev-lang/perl
dev-libs/libev
@@ -29,39 +29,42 @@ CDEPEND="dev-lang/perl
x11-libs/xcb-util-keysyms
x11-libs/xcb-util-wm
x11-libs/xcb-util-xrm
-   pango? (
-   >=x11-libs/pango-1.30.0[X]
-   >=x11-libs/cairo-1.12.2[X,xcb]
-   )"
+   >=x11-libs/pango-1.30.0[X]
+   >=x11-libs/cairo-1.14.4[X,xcb]"
 DEPEND="${CDEPEND}
-   app-text/asciidoc
+   doc? ( app-text/asciidoc app-text/xmlto )
virtual/pkgconfig"
 RDEPEND="${CDEPEND}
dev-perl/AnyEvent-I3
dev-perl/JSON-XS"
 
 src_prepare() {
-   if ! use pango; then
-   sed -i common.mk -e '/PANGO/d' || die
+   default
+
+   if ! use doc ; then
+   sed -e '/AC_PATH_PROG(\[PATH_ASCIIDOC/d' -i configure.ac || die
fi
+   eautoreconf
 
cat <<- EOF > "${T}"/i3wm
#!/bin/sh
exec /usr/bin/i3
EOF
+}
 
-   epatch_user #471716
+src_configure() {
+   local myeconfargs=( --enable-debug=no )  # otherwise injects -O0 -g
+   econf "${myeconfargs[@]}"
 }
 
 src_compile() {
-   emake V=1 CC="$(tc-getCC)" AR="$(tc-getAR)"
-   emake mans
+   emake -C "${CBUILD}"
 }
 
 src_install() {
-   default
-   dohtml -r docs/*
-   doman man/*.1
+   emake -C "${CBUILD}" DESTDIR="${D}" install
+   einstalldocs
+
exeinto /etc/X11/Sessions
doexe "${T}"/i3wm
 }



[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/

2016-11-09 Thread Kacper Kowalik
commit: 902086ad80dfbce0c3ae64b35a6047424dd51a4c
Author: Kacper Kowalik  gentoo  org>
AuthorDate: Wed Nov  9 23:20:35 2016 +
Commit: Kacper Kowalik  gentoo  org>
CommitDate: Wed Nov  9 23:20:35 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=902086ad

x11-wm/i3: update live ebuild, fixes #598976

Reported-by: arya  bfam.tv>

Package-Manager: portage-2.2.28

 x11-wm/i3/i3-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/i3/i3-.ebuild b/x11-wm/i3/i3-.ebuild
index f1ac47a..bc86849 100644
--- a/x11-wm/i3/i3-.ebuild
+++ b/x11-wm/i3/i3-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 



[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/

2016-11-09 Thread Kacper Kowalik
commit: 79b6fe78592c9f63bdedb17d24d2e0b97a60dfc8
Author: Kacper Kowalik  gentoo  org>
AuthorDate: Wed Nov  9 22:48:34 2016 +
Commit: Kacper Kowalik  gentoo  org>
CommitDate: Wed Nov  9 22:48:34 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79b6fe78

x11-wm/i3: version bump

Package-Manager: portage-2.2.28

 x11-wm/i3/Manifest   |  1 +
 x11-wm/i3/i3-4.13.ebuild | 76 
 x11-wm/i3/metadata.xml   |  3 ++
 3 files changed, 80 insertions(+)

diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index 0e8cf0e..9d7b49a 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -1,5 +1,6 @@
 DIST i3-4.10.4.tar.bz2 940744 SHA256 
dd4fa7a5c5b8feaf83f196fc181bfd33aff65c11d81c91b3ae9d9d3d2540655e SHA512 
e777d1ca8ebeada185dfe11443a8b731cb72b6f836a0848e24291ea5d70e4b6d6c414acd58c156be97bd90d07ba4019a713cdb406a24fda33afeae08ceb6ed18
 WHIRLPOOL 
5bfaeb74d8f1c3dc10719bcac56087d7716e0a7a6c251495db256af1d1342eea3baae4b5c4f6c8131efa89393016c0dd0a56b17ff1f7bd757185dbf4747e7441
 DIST i3-4.11.tar.bz2 972929 SHA256 
78ce1e06fbd92fd63765bbe23faa7b8f929c17f99ed623f7abf2e568169d982f SHA512 
76d45be9006973dd4093fd21ea1c83742b7977c7698e133ce8f9e7826d97d1631fbe6c3ea4a7eb3d989027f98e12738158e72ec450b0df328f912ff49a4f
 WHIRLPOOL 
f3bff5c0386ad09c5cabb25c7ccb14033f1a7ba3ee19fcc832739cbc61a31f84d3a57418264db4728fbb406c24464a8c87cbfde1e651599a3b63d87eb0af11cb
 DIST i3-4.12.tar.bz2 988084 SHA256 
e19e1ce08c2549cba83e083cc768d487202c41760d5c283f67752e791f1d78b4 SHA512 
966f62dbd82c6c70d1344cc61f14f154f3f649ce1b5a5b5168f00f50d598582ef26f5bd5496ea62e13213e45b1c7043f6209c94fcbefe2947fec63284445c1f5
 WHIRLPOOL 
7cf414de6d375029328edc8d824d2542ccae99ddf48eac9a563e81e0e86db5506f45f851d5af755ebfe8514e9afb5f8394d962fb191f4b0ab4268a81b8397395
+DIST i3-4.13.tar.bz2 1121298 SHA256 
94c13183e527a984132a3b050c8bf629626502a6e133e07b413641aec5f8cf8a SHA512 
1bb1044e8d86e78d3ccb79d49f0eb26665dcd05a348058a5e57138151d74f57d77830efc3025893170fe1b8ec612f739f75247a427410f96286b09afd2c5f14c
 WHIRLPOOL 
c0e9b205837e30d214d525af6ceb8adcc4cbbba42d9aa0eab4e7639cbd8884d827c5783590eb23a6790e8d8d87fb81884afa369e48a7ae474613392dc6f9b371
 DIST i3-4.8.tar.bz2 939690 SHA256 
502c34290f239780bb40352191f0500e8f35d2446eddb573c67c27873d6a1b6b SHA512 
fd6f92da857246119f1ae710b6c5168128fa2da5eae8308550b1b9c75879f060cac8246897333f3d67e18de36828a11dd12b4ccee9bd6cd6ad32e2b44c50b43e
 WHIRLPOOL 
6c6288cb66ffdbf225df0dfcdc4f540cd36d7c8333a9f9d9c363cb6580d6a7c1ca0deb227a8f46ac907f2afc6e4e46efc448a51f0764a167bb9639956beae4ef
 DIST i3-4.9.1.tar.bz2 939630 SHA256 
b70deff027c7d05276c9646e53faeeeccdde706370b9b337a633bed85b16dc43 SHA512 
7a8f71dd944faae426a2239b8bf12ea1cfc83a95c49fcb64ded8321ef302f3277af7d2ecd84d99cef47aba73e5a1091f94e37e9ed2af78c4722ffee507477c90
 WHIRLPOOL 
15cd2722beaeef642815edd44ff189ff0d003fefbff71c067b94a65dadb55cd15dd1a142a37499fa55cc80424dbdc74cb979c8998d740addcc492eaf025e467f

diff --git a/x11-wm/i3/i3-4.13.ebuild b/x11-wm/i3/i3-4.13.ebuild
new file mode 100644
index ..9e17c0b
--- /dev/null
+++ b/x11-wm/i3/i3-4.13.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="An improved dynamic tiling window manager"
+HOMEPAGE="http://i3wm.org/;
+SRC_URI="http://i3wm.org/downloads/${P}.tar.bz2;
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc"
+
+CDEPEND="dev-libs/libev
+   dev-libs/libpcre
+   >=dev-libs/yajl-2.0.3
+   x11-libs/libxcb[xkb]
+   x11-libs/libxkbcommon[X]
+   x11-libs/startup-notification
+   x11-libs/xcb-util
+   x11-libs/xcb-util-cursor
+   x11-libs/xcb-util-keysyms
+   x11-libs/xcb-util-wm
+   >=x11-libs/cairo-1.14.4[X,xcb]
+   >=x11-libs/pango-1.30.0[X]"
+DEPEND="${CDEPEND}
+   virtual/pkgconfig
+   doc? ( app-text/asciidoc app-text/xmlto )"
+RDEPEND="${CDEPEND}
+   dev-lang/perl
+   dev-perl/AnyEvent-I3
+   dev-perl/JSON-XS"
+
+DOCS=( RELEASE-NOTES-${PV} )
+
+src_prepare() {
+   if ! use doc ; then
+   sed -e '/AC_PATH_PROG(\[PATH_ASCIIDOC/d' -i configure.ac || die
+   eautoreconf
+   fi
+   cat <<- EOF > "${T}"/i3wm
+   #!/bin/sh
+   exec /usr/bin/i3
+   EOF
+   default
+}
+
+src_compile() {
+   emake -C "${CBUILD}"
+}
+
+src_install() {
+   emake -C "${CBUILD}" DESTDIR="${D}" install
+   if ! use doc ; then
+   # install docs shipped with source tarball
+   # local HTML_DOCS=( docs/. ) # TODO: install unconditionally?
+   doman man/*.1
+   fi
+   einstalldocs
+
+   exeinto /etc/X11/Sessions
+   doexe "${T}"/i3wm
+}
+
+pkg_postinst() {
+   einfo "There are several packages that you may find useful with ${PN} 
and"
+   einfo "their usage is suggested by the upstream maintainers, namely:"
+   

[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/

2016-06-17 Thread Kacper Kowalik
commit: 9d98ec1351e7291407aa8999d42cbb4e1511b933
Author: Kacper Kowalik  gentoo  org>
AuthorDate: Fri Jun 17 13:28:03 2016 +
Commit: Kacper Kowalik  gentoo  org>
CommitDate: Fri Jun 17 13:28:03 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d98ec13

x11-wm/i3: Add missing dependency on x11-libs/xcb-util-xrm

Package-Manager: portage-2.2.28

 x11-wm/i3/i3-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/x11-wm/i3/i3-.ebuild b/x11-wm/i3/i3-.ebuild
index ff4b0c7..03b4ef6 100644
--- a/x11-wm/i3/i3-.ebuild
+++ b/x11-wm/i3/i3-.ebuild
@@ -28,6 +28,7 @@ CDEPEND="dev-lang/perl
x11-libs/xcb-util-cursor
x11-libs/xcb-util-keysyms
x11-libs/xcb-util-wm
+   x11-libs/xcb-util-xrm
pango? (
>=x11-libs/pango-1.30.0[X]
>=x11-libs/cairo-1.12.2[X,xcb]



[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/

2016-05-22 Thread Pacho Ramos
commit: 7d4c9a81eed420aaf117fe581818321073a9f67c
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun May 22 19:27:43 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun May 22 19:33:55 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d4c9a81

x11-wm/i3: Cleanup due to #408423

Package-Manager: portage-2.3.0_rc1

 x11-wm/i3/metadata.xml | 5 -
 1 file changed, 5 deletions(-)

diff --git a/x11-wm/i3/metadata.xml b/x11-wm/i3/metadata.xml
index dc21ac6..89b766f 100644
--- a/x11-wm/i3/metadata.xml
+++ b/x11-wm/i3/metadata.xml
@@ -5,11 +5,6 @@
xarthis...@gentoo.org
Kacper Kowalik

-   
-   hasuf...@gentoo.org
-   Julian Ospald
-   Maintains the live ebuild.
-   

Use x11-libs/pango to render text 
in order to support fonts which have more glyphs (e.g. Kanji). See 
RELEASE-NOTES for more information




[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/files/, x11-wm/i3/

2016-03-07 Thread Kacper Kowalik
commit: c28560d3da197cb22026c308aab16a56b87ed4f1
Author: Kacper Kowalik  gentoo  org>
AuthorDate: Tue Mar  8 02:10:50 2016 +
Commit: Kacper Kowalik  gentoo  org>
CommitDate: Tue Mar  8 02:11:57 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c28560d3

x11-wm/i3: fix build without cairo/pango, correct dep on cairo version

Fixes bug #576664

Reported-by: Coacher 

Package-Manager: portage-2.2.27

 x11-wm/i3/files/i3-4.12-pango.patch | 181 
 x11-wm/i3/i3-4.12.ebuild|  19 +++-
 2 files changed, 197 insertions(+), 3 deletions(-)

diff --git a/x11-wm/i3/files/i3-4.12-pango.patch 
b/x11-wm/i3/files/i3-4.12-pango.patch
new file mode 100644
index 000..6442796
--- /dev/null
+++ b/x11-wm/i3/files/i3-4.12-pango.patch
@@ -0,0 +1,181 @@
+Fixes builds with without pango/cairo
+
+https://github.com/i3/i3/pull/2243
+https://bugs.gentoo.org/show_bug.cgi?id=576664
+
+--- a/include/libi3.h
 b/include/libi3.h
+@@ -20,7 +20,7 @@
+ #if PANGO_SUPPORT
+ #include 
+ #endif
+-#ifdef CAIRO_SUPPORT
++#if CAIRO_SUPPORT
+ #include 
+ #endif
+ 
+@@ -518,7 +518,7 @@ typedef struct placeholder_t {
+  */
+ char *format_placeholders(char *format, placeholder_t *placeholders, int num);
+ 
+-#ifdef CAIRO_SUPPORT
++#if CAIRO_SUPPORT
+ /* We need to flush cairo surfaces twice to avoid an assertion bug. See #1989
+  * and https://bugs.freedesktop.org/show_bug.cgi?id=92455. */
+ #define CAIRO_SURFACE_FLUSH(surface)  \
+@@ -542,7 +542,7 @@ typedef struct surface_t {
+ int width;
+ int height;
+ 
+-#ifdef CAIRO_SUPPORT
++#if CAIRO_SUPPORT
+ /* A cairo surface representing the drawable. */
+ cairo_surface_t *surface;
+ 
+--- a/libi3/draw_util.c
 b/libi3/draw_util.c
+@@ -11,7 +11,7 @@
+ #include 
+ #include 
+ #include 
+-#ifdef CAIRO_SUPPORT
++#if CAIRO_SUPPORT
+ #include 
+ #endif
+ 
+@@ -50,7 +50,7 @@ void draw_util_surface_init(xcb_connection_t *conn, 
surface_t *surface, xcb_draw
+ ELOG("Could not create graphical context. Error code: %d. Please 
report this bug.\n", error->error_code);
+ }
+ 
+-#ifdef CAIRO_SUPPORT
++#if CAIRO_SUPPORT
+ surface->surface = cairo_xcb_surface_create(conn, surface->id, 
surface->visual_type, width, height);
+ surface->cr = cairo_create(surface->surface);
+ #endif
+@@ -62,7 +62,7 @@ void draw_util_surface_init(xcb_connection_t *conn, 
surface_t *surface, xcb_draw
+  */
+ void draw_util_surface_free(xcb_connection_t *conn, surface_t *surface) {
+ xcb_free_gc(conn, surface->gc);
+-#ifdef CAIRO_SUPPORT
++#if CAIRO_SUPPORT
+ cairo_surface_destroy(surface->surface);
+ cairo_destroy(surface->cr);
+ 
+@@ -81,7 +81,7 @@ void draw_util_surface_free(xcb_connection_t *conn, 
surface_t *surface) {
+ void draw_util_surface_set_size(surface_t *surface, int width, int height) {
+ surface->width = width;
+ surface->height = height;
+-#ifdef CAIRO_SUPPORT
++#if CAIRO_SUPPORT
+ cairo_xcb_surface_set_size(surface->surface, width, height);
+ #endif
+ }
+@@ -121,7 +121,7 @@ color_t draw_util_hex_to_color(const char *color) {
+ static void draw_util_set_source_color(xcb_connection_t *conn, surface_t 
*surface, color_t color) {
+ RETURN_UNLESS_SURFACE_INITIALIZED(surface);
+ 
+-#ifdef CAIRO_SUPPORT
++#if CAIRO_SUPPORT
+ cairo_set_source_rgba(surface->cr, color.red, color.green, color.blue, 
color.alpha);
+ #else
+ uint32_t colorpixel = color.colorpixel;
+@@ -139,7 +139,7 @@ static void draw_util_set_source_color(xcb_connection_t 
*conn, surface_t *surfac
+ void draw_util_text(i3String *text, surface_t *surface, color_t fg_color, 
color_t bg_color, int x, int y, int max_width) {
+ RETURN_UNLESS_SURFACE_INITIALIZED(surface);
+ 
+-#ifdef CAIRO_SUPPORT
++#if CAIRO_SUPPORT
+ /* Flush any changes before we draw the text as this might use XCB 
directly. */
+ CAIRO_SURFACE_FLUSH(surface->surface);
+ #endif
+@@ -147,7 +147,7 @@ void draw_util_text(i3String *text, surface_t *surface, 
color_t fg_color, color_
+ set_font_colors(surface->gc, fg_color, bg_color);
+ draw_text(text, surface->id, surface->gc, surface->visual_type, x, y, 
max_width);
+ 
+-#ifdef CAIRO_SUPPORT
++#if CAIRO_SUPPORT
+ /* Notify cairo that we (possibly) used another way to draw on the 
surface. */
+ cairo_surface_mark_dirty(surface->surface);
+ #endif
+@@ -162,7 +162,7 @@ void draw_util_text(i3String *text, surface_t *surface, 
color_t fg_color, color_
+ void draw_util_rectangle(xcb_connection_t *conn, surface_t *surface, color_t 
color, double x, double y, double w, double h) {
+ RETURN_UNLESS_SURFACE_INITIALIZED(surface);
+ 
+-#ifdef CAIRO_SUPPORT
++#if CAIRO_SUPPORT
+ cairo_save(surface->cr);
+ 
+ /* Using the SOURCE operator will copy both color and alpha information 
directly
+@@ -194,7 +194,7 @@ void draw_util_rectangle(xcb_connection_t *conn, surface_t 
*surface, color_t col
+ void draw_util_clear_surface(xcb_connection_t *conn, 

[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/

2016-03-06 Thread Kacper Kowalik
commit: d6df7625e845b25bdc1b4c2b239b2ad497247b61
Author: Kacper Kowalik  gentoo  org>
AuthorDate: Sun Mar  6 21:29:09 2016 +
Commit: Kacper Kowalik  gentoo  org>
CommitDate: Sun Mar  6 21:29:09 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6df7625

x11-wm/i3: version bump

Package-Manager: portage-2.2.27

 x11-wm/i3/Manifest   |  1 +
 x11-wm/i3/i3-4.12.ebuild | 73 
 2 files changed, 74 insertions(+)

diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index 45f3a57..0e8cf0e 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -1,4 +1,5 @@
 DIST i3-4.10.4.tar.bz2 940744 SHA256 
dd4fa7a5c5b8feaf83f196fc181bfd33aff65c11d81c91b3ae9d9d3d2540655e SHA512 
e777d1ca8ebeada185dfe11443a8b731cb72b6f836a0848e24291ea5d70e4b6d6c414acd58c156be97bd90d07ba4019a713cdb406a24fda33afeae08ceb6ed18
 WHIRLPOOL 
5bfaeb74d8f1c3dc10719bcac56087d7716e0a7a6c251495db256af1d1342eea3baae4b5c4f6c8131efa89393016c0dd0a56b17ff1f7bd757185dbf4747e7441
 DIST i3-4.11.tar.bz2 972929 SHA256 
78ce1e06fbd92fd63765bbe23faa7b8f929c17f99ed623f7abf2e568169d982f SHA512 
76d45be9006973dd4093fd21ea1c83742b7977c7698e133ce8f9e7826d97d1631fbe6c3ea4a7eb3d989027f98e12738158e72ec450b0df328f912ff49a4f
 WHIRLPOOL 
f3bff5c0386ad09c5cabb25c7ccb14033f1a7ba3ee19fcc832739cbc61a31f84d3a57418264db4728fbb406c24464a8c87cbfde1e651599a3b63d87eb0af11cb
+DIST i3-4.12.tar.bz2 988084 SHA256 
e19e1ce08c2549cba83e083cc768d487202c41760d5c283f67752e791f1d78b4 SHA512 
966f62dbd82c6c70d1344cc61f14f154f3f649ce1b5a5b5168f00f50d598582ef26f5bd5496ea62e13213e45b1c7043f6209c94fcbefe2947fec63284445c1f5
 WHIRLPOOL 
7cf414de6d375029328edc8d824d2542ccae99ddf48eac9a563e81e0e86db5506f45f851d5af755ebfe8514e9afb5f8394d962fb191f4b0ab4268a81b8397395
 DIST i3-4.8.tar.bz2 939690 SHA256 
502c34290f239780bb40352191f0500e8f35d2446eddb573c67c27873d6a1b6b SHA512 
fd6f92da857246119f1ae710b6c5168128fa2da5eae8308550b1b9c75879f060cac8246897333f3d67e18de36828a11dd12b4ccee9bd6cd6ad32e2b44c50b43e
 WHIRLPOOL 
6c6288cb66ffdbf225df0dfcdc4f540cd36d7c8333a9f9d9c363cb6580d6a7c1ca0deb227a8f46ac907f2afc6e4e46efc448a51f0764a167bb9639956beae4ef
 DIST i3-4.9.1.tar.bz2 939630 SHA256 
b70deff027c7d05276c9646e53faeeeccdde706370b9b337a633bed85b16dc43 SHA512 
7a8f71dd944faae426a2239b8bf12ea1cfc83a95c49fcb64ded8321ef302f3277af7d2ecd84d99cef47aba73e5a1091f94e37e9ed2af78c4722ffee507477c90
 WHIRLPOOL 
15cd2722beaeef642815edd44ff189ff0d003fefbff71c067b94a65dadb55cd15dd1a142a37499fa55cc80424dbdc74cb979c8998d740addcc492eaf025e467f

diff --git a/x11-wm/i3/i3-4.12.ebuild b/x11-wm/i3/i3-4.12.ebuild
new file mode 100644
index 000..eabd399
--- /dev/null
+++ b/x11-wm/i3/i3-4.12.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="An improved dynamic tiling window manager"
+HOMEPAGE="http://i3wm.org/;
+SRC_URI="http://i3wm.org/downloads/${P}.tar.bz2;
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+pango"
+
+CDEPEND="dev-libs/libev
+   dev-libs/libpcre
+   >=dev-libs/yajl-2.0.3
+   x11-libs/libxcb[xkb]
+   x11-libs/libxkbcommon[X]
+   x11-libs/startup-notification
+   x11-libs/xcb-util
+   x11-libs/xcb-util-cursor
+   x11-libs/xcb-util-keysyms
+   x11-libs/xcb-util-wm
+   pango? (
+   >=x11-libs/pango-1.30.0[X]
+   >=x11-libs/cairo-1.12.2[X,xcb]
+   )"
+DEPEND="${CDEPEND}
+   virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+   dev-lang/perl
+   dev-perl/AnyEvent-I3
+   dev-perl/JSON-XS"
+
+DOCS=( RELEASE-NOTES-${PV} )
+
+src_prepare() {
+   if ! use pango; then
+   sed -i common.mk -e '/PANGO/d' || die
+   fi
+
+   cat <<- EOF > "${T}"/i3wm
+   #!/bin/sh
+   exec /usr/bin/i3
+   EOF
+   sed -e 's/FALSE/false/' -i src/handlers.c || die #546444
+   epatch_user #471716
+}
+
+src_compile() {
+   emake V=1 CC="$(tc-getCC)" AR="$(tc-getAR)"
+}
+
+src_install() {
+   default
+   dohtml -r docs/*
+   doman man/*.1
+   exeinto /etc/X11/Sessions
+   doexe "${T}"/i3wm
+}
+
+pkg_postinst() {
+   einfo "There are several packages that you may find useful with ${PN} 
and"
+   einfo "their usage is suggested by the upstream maintainers, namely:"
+   einfo "  x11-misc/dmenu"
+   einfo "  x11-misc/i3status"
+   einfo "  x11-misc/i3lock"
+   einfo "Please refer to their description for additional info."
+}



[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/

2015-10-04 Thread Agostino Sarubbo
commit: 6a82a281109fb7a845cda6b790d61f10241a707d
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Oct  4 10:14:03 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Oct  4 10:14:03 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a82a281

x11-wm/i3: x86 stable wrt bug #561910

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="x86"

 x11-wm/i3/i3-4.10.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/i3/i3-4.10.4.ebuild b/x11-wm/i3/i3-4.10.4.ebuild
index b637b1e..646dae9 100644
--- a/x11-wm/i3/i3-4.10.4.ebuild
+++ b/x11-wm/i3/i3-4.10.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://i3wm.org/downloads/${P}.tar.bz2;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="+pango"
 
 CDEPEND="dev-libs/libev



[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/

2015-10-01 Thread Agostino Sarubbo
commit: b5114e1bcc2be57ecbeb8b6e5383e2a3cdf710c0
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Oct  1 12:37:04 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Oct  1 12:37:04 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5114e1b

x11-wm/i3: amd64 stable wrt bug #561910

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="amd64"

 x11-wm/i3/i3-4.10.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/i3/i3-4.10.4.ebuild b/x11-wm/i3/i3-4.10.4.ebuild
index 17b045c..b637b1e 100644
--- a/x11-wm/i3/i3-4.10.4.ebuild
+++ b/x11-wm/i3/i3-4.10.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://i3wm.org/downloads/${P}.tar.bz2;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="+pango"
 
 CDEPEND="dev-libs/libev



[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/

2015-09-30 Thread Kacper Kowalik
commit: d8872fedeb3c56aa0258fa3d7e8369bdd558f66b
Author: Kacper Kowalik  gentoo  org>
AuthorDate: Wed Sep 30 14:42:35 2015 +
Commit: Kacper Kowalik  gentoo  org>
CommitDate: Wed Sep 30 14:43:10 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8872fed

Version bump

Package-Manager: portage-2.2.20

 x11-wm/i3/Manifest   |  1 +
 x11-wm/i3/i3-4.11.ebuild | 73 
 2 files changed, 74 insertions(+)

diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index 8d2e170..45f3a57 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -1,3 +1,4 @@
 DIST i3-4.10.4.tar.bz2 940744 SHA256 
dd4fa7a5c5b8feaf83f196fc181bfd33aff65c11d81c91b3ae9d9d3d2540655e SHA512 
e777d1ca8ebeada185dfe11443a8b731cb72b6f836a0848e24291ea5d70e4b6d6c414acd58c156be97bd90d07ba4019a713cdb406a24fda33afeae08ceb6ed18
 WHIRLPOOL 
5bfaeb74d8f1c3dc10719bcac56087d7716e0a7a6c251495db256af1d1342eea3baae4b5c4f6c8131efa89393016c0dd0a56b17ff1f7bd757185dbf4747e7441
+DIST i3-4.11.tar.bz2 972929 SHA256 
78ce1e06fbd92fd63765bbe23faa7b8f929c17f99ed623f7abf2e568169d982f SHA512 
76d45be9006973dd4093fd21ea1c83742b7977c7698e133ce8f9e7826d97d1631fbe6c3ea4a7eb3d989027f98e12738158e72ec450b0df328f912ff49a4f
 WHIRLPOOL 
f3bff5c0386ad09c5cabb25c7ccb14033f1a7ba3ee19fcc832739cbc61a31f84d3a57418264db4728fbb406c24464a8c87cbfde1e651599a3b63d87eb0af11cb
 DIST i3-4.8.tar.bz2 939690 SHA256 
502c34290f239780bb40352191f0500e8f35d2446eddb573c67c27873d6a1b6b SHA512 
fd6f92da857246119f1ae710b6c5168128fa2da5eae8308550b1b9c75879f060cac8246897333f3d67e18de36828a11dd12b4ccee9bd6cd6ad32e2b44c50b43e
 WHIRLPOOL 
6c6288cb66ffdbf225df0dfcdc4f540cd36d7c8333a9f9d9c363cb6580d6a7c1ca0deb227a8f46ac907f2afc6e4e46efc448a51f0764a167bb9639956beae4ef
 DIST i3-4.9.1.tar.bz2 939630 SHA256 
b70deff027c7d05276c9646e53faeeeccdde706370b9b337a633bed85b16dc43 SHA512 
7a8f71dd944faae426a2239b8bf12ea1cfc83a95c49fcb64ded8321ef302f3277af7d2ecd84d99cef47aba73e5a1091f94e37e9ed2af78c4722ffee507477c90
 WHIRLPOOL 
15cd2722beaeef642815edd44ff189ff0d003fefbff71c067b94a65dadb55cd15dd1a142a37499fa55cc80424dbdc74cb979c8998d740addcc492eaf025e467f

diff --git a/x11-wm/i3/i3-4.11.ebuild b/x11-wm/i3/i3-4.11.ebuild
new file mode 100644
index 000..17b045c
--- /dev/null
+++ b/x11-wm/i3/i3-4.11.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="An improved dynamic tiling window manager"
+HOMEPAGE="http://i3wm.org/;
+SRC_URI="http://i3wm.org/downloads/${P}.tar.bz2;
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+pango"
+
+CDEPEND="dev-libs/libev
+   dev-libs/libpcre
+   >=dev-libs/yajl-2.0.3
+   x11-libs/libxcb[xkb]
+   x11-libs/libxkbcommon[X]
+   x11-libs/startup-notification
+   x11-libs/xcb-util
+   x11-libs/xcb-util-cursor
+   x11-libs/xcb-util-keysyms
+   x11-libs/xcb-util-wm
+   pango? (
+   >=x11-libs/pango-1.30.0[X]
+   >=x11-libs/cairo-1.12.2[X,xcb]
+   )"
+DEPEND="${CDEPEND}
+   virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+   dev-lang/perl
+   dev-perl/AnyEvent-I3
+   dev-perl/JSON-XS"
+
+DOCS=( RELEASE-NOTES-${PV} )
+
+src_prepare() {
+   if ! use pango; then
+   sed -i common.mk -e '/PANGO/d' || die
+   fi
+
+   cat <<- EOF > "${T}"/i3wm
+   #!/bin/sh
+   exec /usr/bin/i3
+   EOF
+   sed -e 's/FALSE/false/' -i src/handlers.c || die #546444
+   epatch_user #471716
+}
+
+src_compile() {
+   emake V=1 CC="$(tc-getCC)" AR="$(tc-getAR)"
+}
+
+src_install() {
+   default
+   dohtml -r docs/*
+   doman man/*.1
+   exeinto /etc/X11/Sessions
+   doexe "${T}"/i3wm
+}
+
+pkg_postinst() {
+   einfo "There are several packages that you may find useful with ${PN} 
and"
+   einfo "their usage is suggested by the upstream maintainers, namely:"
+   einfo "  x11-misc/dmenu"
+   einfo "  x11-misc/i3status"
+   einfo "  x11-misc/i3lock"
+   einfo "Please refer to their description for additional info."
+}



[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/

2015-09-08 Thread Kacper Kowalik
commit: 822af9279fc4ff1c7593d9a2b6d644263ad42dc2
Author: Kacper Kowalik  gentoo  org>
AuthorDate: Tue Sep  8 14:47:06 2015 +
Commit: Kacper Kowalik  gentoo  org>
CommitDate: Tue Sep  8 14:47:06 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=822af927

Version bump, drop old

Package-Manager: portage-2.2.20

 x11-wm/i3/Manifest   | 2 +-
 x11-wm/i3/{i3-4.10.3.ebuild => i3-4.10.4.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index 4425d53..8d2e170 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -1,3 +1,3 @@
-DIST i3-4.10.3.tar.bz2 941295 SHA256 
9290857bd5a4d1a792544d763bedd53104a683f3e721b5631811827a388107d3 SHA512 
914456663158d04868fc15820e3ca3c12663f6af120d2e249b0e2930214808cf19d719acbef9aed2931a322973e92e0da85a2e1d72a135e5894e81f14f2889f1
 WHIRLPOOL 
ddca44ea2a9aeae140df26945860279987690bc7bedcb4395da2c1d52593081934f7cb2d819ff2d575eca855c29078a4155363fe0b116853ce637b86a4700d9e
+DIST i3-4.10.4.tar.bz2 940744 SHA256 
dd4fa7a5c5b8feaf83f196fc181bfd33aff65c11d81c91b3ae9d9d3d2540655e SHA512 
e777d1ca8ebeada185dfe11443a8b731cb72b6f836a0848e24291ea5d70e4b6d6c414acd58c156be97bd90d07ba4019a713cdb406a24fda33afeae08ceb6ed18
 WHIRLPOOL 
5bfaeb74d8f1c3dc10719bcac56087d7716e0a7a6c251495db256af1d1342eea3baae4b5c4f6c8131efa89393016c0dd0a56b17ff1f7bd757185dbf4747e7441
 DIST i3-4.8.tar.bz2 939690 SHA256 
502c34290f239780bb40352191f0500e8f35d2446eddb573c67c27873d6a1b6b SHA512 
fd6f92da857246119f1ae710b6c5168128fa2da5eae8308550b1b9c75879f060cac8246897333f3d67e18de36828a11dd12b4ccee9bd6cd6ad32e2b44c50b43e
 WHIRLPOOL 
6c6288cb66ffdbf225df0dfcdc4f540cd36d7c8333a9f9d9c363cb6580d6a7c1ca0deb227a8f46ac907f2afc6e4e46efc448a51f0764a167bb9639956beae4ef
 DIST i3-4.9.1.tar.bz2 939630 SHA256 
b70deff027c7d05276c9646e53faeeeccdde706370b9b337a633bed85b16dc43 SHA512 
7a8f71dd944faae426a2239b8bf12ea1cfc83a95c49fcb64ded8321ef302f3277af7d2ecd84d99cef47aba73e5a1091f94e37e9ed2af78c4722ffee507477c90
 WHIRLPOOL 
15cd2722beaeef642815edd44ff189ff0d003fefbff71c067b94a65dadb55cd15dd1a142a37499fa55cc80424dbdc74cb979c8998d740addcc492eaf025e467f

diff --git a/x11-wm/i3/i3-4.10.3.ebuild b/x11-wm/i3/i3-4.10.4.ebuild
similarity index 100%
rename from x11-wm/i3/i3-4.10.3.ebuild
rename to x11-wm/i3/i3-4.10.4.ebuild



[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/

2015-08-26 Thread Kacper Kowalik
commit: afb506a4a781a83e068a5f9c1d29f865ddb28449
Author: Kacper Kowalik xarthisius AT gentoo DOT org
AuthorDate: Wed Aug 26 14:38:57 2015 +
Commit: Kacper Kowalik xarthisius AT gentoo DOT org
CommitDate: Wed Aug 26 14:38:57 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afb506a4

Apply upstream patch to fix undeclared 'FALSE' error. Fixes #546444

Package-Manager: portage-2.2.20

 x11-wm/i3/i3-4.10.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/i3/i3-4.10.3.ebuild b/x11-wm/i3/i3-4.10.3.ebuild
index 37b6435..17b045c 100644
--- a/x11-wm/i3/i3-4.10.3.ebuild
+++ b/x11-wm/i3/i3-4.10.3.ebuild
@@ -47,7 +47,7 @@ src_prepare() {
#!/bin/sh
exec /usr/bin/i3
EOF
-
+   sed -e 's/FALSE/false/' -i src/handlers.c || die #546444
epatch_user #471716
 }