From d39e58a73feaeb383a4054b79c4dbedd90c8af12 Mon Sep 17 00:00:00 2001 From: Kacper Kowalik Date: Sat, 12 Nov 2011 09:43:11 +0000 Subject: [PATCH] Version bump wrt #390239 by Simeon Maryasin. Drop versionator and base eclasses, add new deps on startup-notification and libpcre. Drop old Package-Manager: portage-2.2.0_alpha73/cvs/Linux x86_64 --- x11-wm/i3/ChangeLog | 9 +- x11-wm/i3/Manifest | 25 +++-- x11-wm/i3/files/i3-4.0.1-gentoo-r1.diff | 124 ------------------------ x11-wm/i3/i3-4.0.2-r1.ebuild | 64 ------------ x11-wm/i3/i3-4.1.ebuild | 55 +++++++++++ 5 files changed, 79 insertions(+), 198 deletions(-) delete mode 100644 x11-wm/i3/files/i3-4.0.1-gentoo-r1.diff delete mode 100644 x11-wm/i3/i3-4.0.2-r1.ebuild create mode 100644 x11-wm/i3/i3-4.1.ebuild diff --git a/x11-wm/i3/ChangeLog b/x11-wm/i3/ChangeLog index 4422e29a1705..ebd349e42f9c 100644 --- a/x11-wm/i3/ChangeLog +++ b/x11-wm/i3/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-wm/i3 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/i3/ChangeLog,v 1.9 2011/10/10 15:24:03 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/i3/ChangeLog,v 1.10 2011/11/12 09:43:11 xarthisius Exp $ + +*i3-4.1 (12 Nov 2011) + + 12 Nov 2011; Kacper Kowalik + -files/i3-4.0.1-gentoo-r1.diff, -i3-4.0.2-r1.ebuild, +i3-4.1.ebuild: + Version bump wrt #390239 by Simeon Maryasin. Drop versionator and base + eclasses, add new deps on startup-notification and libpcre. Drop old *i3-4.0.2-r1 (10 Oct 2011) diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest index dcfe6d6cdc60..ffcc76ddfc04 100644 --- a/x11-wm/i3/Manifest +++ b/x11-wm/i3/Manifest @@ -1,17 +1,24 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX i3-4.0.1-gentoo-r1.diff 3476 RMD160 69a87e977cacd173178c5a5f444e27d1357db715 SHA1 e967a70435ef059641ca08473e5b3003aaa79635 SHA256 5f318249b2d46051b8fc3f7a635de20725580b26c01dc28a1f1e53db9ccc3f9e -DIST i3-4.0.2.tar.bz2 475512 RMD160 4a5eacec6f12b0fb15f6c1b2711520b3d9d41742 SHA1 33739a606b06256f71aa0551687336e01644a0d5 SHA256 e656977da86a051b1c10327cca4f400a1ca7ccbd0670ea307f2c1be1c126fc46 -EBUILD i3-4.0.2-r1.ebuild 1520 RMD160 2df89804dcdff4c096ba1b46bb8e5707442aa0aa SHA1 7f24deabdb90931ccd8f6315c4b329b5d763521f SHA256 16f3b26d4330abe1a1e7f1edce3e5ea5060f8e05d96e79dc4606b312bf10367f -MISC ChangeLog 1970 RMD160 573c6b7de18186add67bbcda0fa193f7be542641 SHA1 deffa3442ce4e1e2fec2a44e9ffba57c0f2b28d7 SHA256 20392e3249252eb9ed34e5163d2dc09da1023d28c44f642dec6cf4b307e5c8b7 +DIST i3-4.1.tar.bz2 564086 RMD160 1b7858995e2247e57d74e2314387b1fd5231becf SHA1 e8aa51d32028b3f076b9785c4b46911b50ba6996 SHA256 3b4f21d9bf66f8e4588521dfa706d8cc3fe1999976a55fb5a6c13a621a1455a0 +EBUILD i3-4.1.ebuild 1082 RMD160 cb2a8c2ff69a1932759940277fb189619c2dbc01 SHA1 f63371267a1e4ae989d700414d1f55fde2d43650 SHA256 c1c8acbff3e71257754455539dd2e1da86f3a009a08c876e26f97cf57005a447 +MISC ChangeLog 2264 RMD160 359f7c22e5bc90ff3b1c400f35ff9360c3cc6802 SHA1 54f30224bbae61207e3cf81b9d7197c508026810 SHA256 bc00b1d19276a11d00aa374d7669bdda1e417634c4e58a386eef909d4fd6e830 MISC metadata.xml 262 RMD160 5fa004a3927201d509adf4583c80fcea57d845cb SHA1 7d07024bbe476df939b23a4552ec9a403ec8fff7 SHA256 9efce27cc1c3955b252cc5b7272629cd5b66260849fd9e5a5fae9e420a1829d9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iJwEAQEIAAYFAk6TDh4ACgkQIiMqcbOVdxR3aAP9HJCyP8T/wg+dn3rw98bJmeg0 -8pooCQs9ftyF0uR2eQooSBsXzlHmcB8DpSKniIO1jFLLYNz+Iz37+pllS7xdi9M6 -lAmCVLm41AocwML3RpjZXyS4VhybtAoFsi3ZlWXnn/eQRXpdM0u1z/xMatYQh/c8 -s3AXaMsT3g3JBreyuVk= -=z3Wp +iQIcBAEBCAAGBQJOvj+5AAoJEF0huFKJUZL5wR0QAI4fNh/QfzrwrcN80N0SBFRM +Kac9tlKbX6XUTEwvwrazFxtVZmAF8xIIz9drMUN1uZ76cRZDr4QhvkButIi6HJtq +bU9/VeM9rbv7MnidzieZuDBEpn05NPf0hNFCYmV310XfEyvAZZhxVlUmjlP0K4fV +bO3CLAGIYqCTl5Bz/Kf4gIYTniUvBywwlakfcL9qry+wJdv1vAY6dnJfKUHEGTu/ +xxJG9GncgXaxOuptfKc17DyprXwxQX/XJN8UlsFjqIW0mJlKQjyGngtvAJMMl4eq +orSmfa7TLCnoNO6U22f5Ww65nJcFSA3ZStrewVqzkIL/nqRNF/rFFk/5vbPgW4hI +CPjOUZXhNYCUgAvnoL+Lc6lFrI5BFoS9Jt9MZuiU0hq3kNHhbdfvh+lEMnmH8TdK +4Oa/KB3bqzvpZMLaiEylITWMlN7qXAL9t3YxfJlNI3ZVpx8sA9GeiP6CUyYCulxL +p8lt7s/MBuHtKmQeCWr9WD8NEHO98gPqY4gn+o9Niy3GwDMijc4xUqOeSlXs/Po1 +9GUmq4z2skSrd4nfizjlz5ta9XYbeUuIu7tx0hghr7A/K5NKWZ05yxqkkGeO2+84 +mJ5bjLILyHIF7yBIlqqdHxtlOVtn5EcH2FIBcTILUc14AuWHsvsZORRpHnfZrDLE +sjA+FLs72R+DI2sCxdwi +=9LC1 -----END PGP SIGNATURE----- diff --git a/x11-wm/i3/files/i3-4.0.1-gentoo-r1.diff b/x11-wm/i3/files/i3-4.0.1-gentoo-r1.diff deleted file mode 100644 index 26189cb7b056..000000000000 --- a/x11-wm/i3/files/i3-4.0.1-gentoo-r1.diff +++ /dev/null @@ -1,124 +0,0 @@ ---- a/common.mk -+++ b/common.mk -@@ -1,5 +1,5 @@ - UNAME=$(shell uname) --DEBUG=1 -+DEBUG=0 - COVERAGE=0 - INSTALL=install - ifndef PREFIX -@@ -12,7 +12,7 @@ - SYSCONFDIR=$(PREFIX)/etc - endif - endif --TERM_EMU=xterm -+TERM_EMU=urxvt - # The escaping is absurd, but we need to escape for shell, sed, make, define - GIT_VERSION:="4.0 (2011-07-31, branch \\\"master\\\")" - VERSION:=4.0 -@@ -103,9 +103,6 @@ - # Extended debugging flags, macros shall be available in gcc - CFLAGS += -gdwarf-2 - CFLAGS += -g3 --else --CFLAGS += -O2 --CFLAGS += -freorder-blocks-and-partition - endif - - ifeq ($(COVERAGE),1) -@@ -113,9 +110,6 @@ - LIBS += -lgcov - endif - --# Don’t print command lines which are run --.SILENT: -- - # Always remake the following targets - .PHONY: install clean dist distclean - ---- a/Makefile -+++ b/Makefile -@@ -22,24 +22,19 @@ - - # Depend on the specific file (.c for each .o) and on all headers - src/%.o: src/%.c ${HEADERS} -- echo "CC $<" - $(CC) $(CPPFLAGS) $(CFLAGS) -DLOGLEVEL="((uint64_t)1 << $(shell awk '/$(shell basename $< .c)/ { print NR; exit 0; }' loglevels.tmp))" -c -o $@ $< - - all: i3 subdirs - - i3: src/cfgparse.y.o src/cfgparse.yy.o src/cmdparse.y.o src/cmdparse.yy.o ${FILES} -- echo "LINK i3" - $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) - - subdirs: - for dir in $(SUBDIRS); do \ -- echo ""; \ -- echo "MAKE $$dir"; \ - $(MAKE) -C $$dir; \ - done - - loglevels.h: -- echo "LOGLEVELS" - for file in $$(ls src/*.c src/*.y src/*.l | grep -v 'cfgparse.\(tab\|yy\).c'); \ - do \ - echo $$(basename $$file .c); \ -@@ -51,29 +46,24 @@ - echo "};") > include/loglevels.h; - - src/cfgparse.yy.o: src/cfgparse.l src/cfgparse.y.o ${HEADERS} -- echo "LEX $<" - flex -i -o$(@:.o=.c) $< - $(CC) $(CPPFLAGS) $(CFLAGS) -DLOGLEVEL="(1 << $(shell awk '/cfgparse.l/ { print NR }' loglevels.tmp))" -c -o $@ $(@:.o=.c) - - src/cmdparse.yy.o: src/cmdparse.l src/cmdparse.y.o ${HEADERS} -- echo "LEX $<" - flex -Pcmdyy -i -o$(@:.o=.c) $< - $(CC) $(CPPFLAGS) $(CFLAGS) -DLOGLEVEL="(1 << $(shell awk '/cmdparse.l/ { print NR }' loglevels.tmp))" -c -o $@ $(@:.o=.c) - - - src/cfgparse.y.o: src/cfgparse.y ${HEADERS} -- echo "YACC $<" - bison --debug --verbose -b $(basename $< .y) -d $< - $(CC) $(CPPFLAGS) $(CFLAGS) -DLOGLEVEL="(1 << $(shell awk '/cfgparse.y/ { print NR }' loglevels.tmp))" -c -o $@ $(<:.y=.tab.c) - - src/cmdparse.y.o: src/cmdparse.y ${HEADERS} -- echo "YACC $<" - bison -p cmdyy --debug --verbose -b $(basename $< .y) -d $< - $(CC) $(CPPFLAGS) $(CFLAGS) -DLOGLEVEL="(1 << $(shell awk '/cmdparse.y/ { print NR }' loglevels.tmp))" -c -o $@ $(<:.y=.tab.c) - - - install: all -- echo "INSTALL" - $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/bin - $(INSTALL) -d -m 0755 $(DESTDIR)$(SYSCONFDIR)/i3 - $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/include/i3 -@@ -88,6 +78,7 @@ - for dir in $(SUBDIRS); do \ - $(MAKE) -C $$dir install; \ - done -+ $(MAKE) -C man install - - dist: distclean - [ ! -d i3-${VERSION} ] || rm -rf i3-${VERSION} ---- a/man/Makefile -+++ b/man/Makefile -@@ -1,6 +1,9 @@ - A2M:=a2x -f manpage --asciidoc-opts="-f asciidoc.conf" -+include ../common.mk - --all: i3.1 i3-msg.1 i3-input.1 i3-nagbar.1 i3-wsbar.1 i3-config-wizard.1 i3-migrate-config-to-v4.1 -+MANS=i3.1 i3-msg.1 i3-input.1 i3-nagbar.1 i3-wsbar.1 i3-config-wizard.1 i3-migrate-config-to-v4.1 -+ -+all: $(MANS) - - %.1: %.man asciidoc.conf - ${A2M} $< -@@ -16,3 +19,7 @@ - - distclean: clean - rm -f *.1 -+ -+install: -+ $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/share/man/man1 -+ $(INSTALL) -m 0644 *.1 $(DESTDIR)$(PREFIX)/share/man/man1 diff --git a/x11-wm/i3/i3-4.0.2-r1.ebuild b/x11-wm/i3/i3-4.0.2-r1.ebuild deleted file mode 100644 index 3d57a57d30ca..000000000000 --- a/x11-wm/i3/i3-4.0.2-r1.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/i3/i3-4.0.2-r1.ebuild,v 1.1 2011/10/10 15:24:03 xarthisius Exp $ - -EAPI=4 - -inherit base versionator 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 ~x86" -IUSE="" - -CDEPEND="dev-libs/libev - dev-libs/yajl - x11-libs/libxcb - x11-libs/libXcursor - x11-libs/libX11 - x11-libs/xcb-util" -DEPEND="${CDEPEND} - app-text/asciidoc - dev-util/pkgconfig - sys-devel/flex - sys-devel/bison - x11-proto/xcb-proto" -RDEPEND="${CDEPEND} - dev-perl/AnyEvent-I3 - dev-perl/IPC-Run - dev-perl/Try-Tiny - virtual/perl-Getopt-Long - x11-apps/xmessage" - -DOCS=( GOALS TODO RELEASE-NOTES-${PV} ) -PATCHES=( "${FILESDIR}"/${PN}-4.0.1-gentoo-r1.diff ) - -pkg_setup() { - tc-export CC - ewarn "${PN} uses x11-terms/rxvt-unicode as a default terminal." - ewarn "If you wish to use another one merge ${PN} with:" - ewarn " TERM_EMU= emerge ${PN}" - ewarn "e.g. TERM_EMU=xterm" -} - -src_prepare() { - base_src_prepare - sed -i -e "/echo \"/d" \ - i3{bar,-config-wizard,-input,-msg,-nagbar}/Makefile || die -} - -src_install() { - base_src_install - dohtml -r docs/* - doman i3bar/doc/i3bar.1 -} - -pkg_postinst() { - elog "${PN} uses x11-terms/rxvt-unicode as a default terminal." - elog "Either merge it yourself or change proper bind in" - elog "/etc/${PN}/config or ~/.${PN}/config" -} diff --git a/x11-wm/i3/i3-4.1.ebuild b/x11-wm/i3/i3-4.1.ebuild new file mode 100644 index 000000000000..61e977cf0f3e --- /dev/null +++ b/x11-wm/i3/i3-4.1.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-wm/i3/i3-4.1.ebuild,v 1.1 2011/11/12 09:43:11 xarthisius Exp $ + +EAPI=4 + +inherit 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 ~x86" +IUSE="" + +CDEPEND="dev-libs/libev + dev-libs/libpcre + dev-libs/yajl + x11-libs/libxcb + x11-libs/libXcursor + x11-libs/libX11 + x11-libs/startup-notification + x11-libs/xcb-util" +DEPEND="${CDEPEND} + app-text/asciidoc + dev-util/pkgconfig + sys-devel/flex + sys-devel/bison + x11-proto/xcb-proto" +RDEPEND="${CDEPEND} + dev-perl/AnyEvent-I3 + dev-perl/IPC-Run + dev-perl/Try-Tiny + virtual/perl-Getopt-Long + x11-apps/xmessage" + +DOCS=( RELEASE-NOTES-${PV} ) + +pkg_setup() { + tc-export CC +} + +src_prepare() { + sed -i common.mk \ + -e "/DEBUG=/ s/1/0/" \ + -e '/O2\|reorder\-blocks\|SILENT/d' || die +} + +src_install() { + default + dohtml -r docs/* + doman i3bar/doc/i3bar.1 man/*.1 +} -- 2.26.2