Version bump (bug #467508 by Ted Tanberry).

Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 121 insertions, 6 deletions

diff --git a/x11-misc/dzen/ChangeLog b/x11-misc/dzen/ChangeLog
index 1342619a6974..4ab875c9f66a 100644
--- a/x11-misc/dzen/ChangeLog
+++ b/x11-misc/dzen/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/dzen
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/dzen/ChangeLog,v 1.10 2010/06/06 09:49:15 ssuominen Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/dzen/ChangeLog,v 1.11 2013/07/18 23:22:45 jer Exp $
+
+*dzen-0.9.5 (18 Jul 2013)
+
+  18 Jul 2013; Jeroen Roovers <jer@gentoo.org> +dzen-0.9.5.ebuild,
+  +files/dzen-0.9.5-off-by-one.patch:
+  Version bump (bug #467508 by Ted Tanberry).
 
   06 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> dzen-0.8.5.ebuild:
   Install noisyalert.sh and kittscanner.sh wrt #274730 by Simeon Maryasin.
diff --git a/x11-misc/dzen/Manifest b/x11-misc/dzen/Manifest
index d318a05d0753..70e241fd6a05 100644
--- a/x11-misc/dzen/Manifest
+++ b/x11-misc/dzen/Manifest
@@ -1,4 +1,17 @@
-DIST dzen2-0.8.5.tar.gz 33274 RMD160 bbefbff779cd8eb3ea06eda0666f5b0fe99b7b90 SHA1 9216163e86e02b2a75de1dfec1954b1058a829e4 SHA256 5e4ce96e8ed22a4a0ad6cfafacdde0532d13d049d77744214b196c4b2bcddff9
-EBUILD dzen-0.8.5.ebuild 1800 RMD160 c57f92e979d0ee3215f54f35c143085bfa87f37a SHA1 4d4fc7f81925c4a32663a343e630e92b9b1d425f SHA256 fa60d8df607f30f8ee9999e5b2f07f7036291ff851d5380f5261b9b53f1816ff
-MISC ChangeLog 1528 RMD160 5eee0f4dd1e0f50a61c59a60791ee6a4f06cc6d8 SHA1 e04722e6d622758785a873d7480dccfa0ca6e0aa SHA256 45553ee9b868ce7b6ea1b24974eb56bf1a4bb4d56786e025c7a04ba225be80f2
-MISC metadata.xml 449 RMD160 32e0636ab19e99e336ea56c1746e414b8590eda9 SHA1 f8b2346f5be9f4da77ad692ab24ac6841df6e74d SHA256 5b6b8c642991884a1f4df34a10182643dddefcc2975b9bdd24af2f28845f77da
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX dzen-0.9.5-off-by-one.patch 187 SHA256 eedb8f71dbace49485411ec44b55844316fd6e87d754226a7032e2dd7acf11ce SHA512 f4a27d47e8dd0691006161dcaf26a038185f818be20f8529a04b1b6044bf53de10b562c8cacd4d93d0ef5677208dccd82683d33254d490c181a3f6e414532dc0 WHIRLPOOL 3fd71a08abce0cf4b49b91e4b8961cc2b9de98117fbf53442c2e4c04fbff8fc0e72fab8996adc6e58dbbeb3f8b9118bea50874e4b0c3d423b04683e1c0a5d080
+DIST dzen-0.9.5.tar.gz 38167 SHA256 0556c815de7257bccd50cfa62371e4bc1c358fa1c5a179a4f99890a63912dc19 SHA512 ed4eb5d657d8f3822d8fbf224da5c2d415852c340959840051ec9cfc63f90361e09b9d36cb8221cf046ae66af02b9fab67f4f16c834c5895e801d452e4f8a916 WHIRLPOOL d26831f48effe502e26f5a84c1a3ff18498d8c83053c716e75f4e695af3eec99f5f7fb19132e2d2ac13350d949bc2d9484607ea5a1cbed4b9682f15144ec9d3d
+DIST dzen2-0.8.5.tar.gz 33274 SHA256 5e4ce96e8ed22a4a0ad6cfafacdde0532d13d049d77744214b196c4b2bcddff9 SHA512 04b808ebb7a3a0135a9bab9e79ae0c16cb5d777458d34d5ab39a5279228fb7fa771b5fee8e4a14b325433359ef751dafa95cb1f4f75db7683404e0fe12beb273 WHIRLPOOL 2e458ca510a1aa60692807d90d59dda9d1d552a4c4e23c4367b726cad75e9c07192150683d5a68c4c04ef9bf143cdf07b483b28e0801d70fc2f8c5e8dff063a0
+EBUILD dzen-0.8.5.ebuild 1800 SHA256 fa60d8df607f30f8ee9999e5b2f07f7036291ff851d5380f5261b9b53f1816ff SHA512 4840e3b9aab28ab56e6324896d54a4ad2290f010d572f0d7243eb9308fde6b7ed59cb4707bc8596968efcb0af1a1830a1a3360314dce30e7a381c65f64e50e5c WHIRLPOOL 84eb3b6fc52f000103a519008ea1f2d32470e8875845a7639cf1314cfc9a5796cd73ed3923830c9c2674647adacf60e875d40ac0187b0632f16e0aa1f736fcf6
+EBUILD dzen-0.9.5.ebuild 1839 SHA256 d71d3515155ea419de599fc276511f31410f97af2c11f3f7c6d82b6804aceb7a SHA512 04c5d9ee8445e863133b65ac120f6d7159867d8adfb4f7d5ed61cfab6e4089f7fce030bd2dc7f3c0f00ec1e5433f39a980a67488b3f16f2dbbdc0f83bedd8564 WHIRLPOOL 8b63fb28c897ca41270d5fc71243d77cd04ba836e2612b7086b6dfed328be732766e64ce7bebfb2d151d6cd58ad30d87519876d7fdd6d8b2319d4a87e1094a94
+MISC ChangeLog 1701 SHA256 9652e4530c3ed56315625f0fefa160d5d3cf49f4db5a6b581f52658ad3803df6 SHA512 508998b847a6481761c29a4d7a9a60cf304e5255209263d73730e683112994570cff9782d0cf9ed976af349d42f52c8774ac1ee8bb42986e050f4d1b526a44e5 WHIRLPOOL 44730f4aa9b021ffd0a50d28bf70e02c931f0ffc1dfc40deb676ce849f82c4b3375de28d504e514b29c54f129c884ed579af384dcad4d68b744c6623aead1fca
+MISC metadata.xml 449 SHA256 5b6b8c642991884a1f4df34a10182643dddefcc2975b9bdd24af2f28845f77da SHA512 c05aea1fca83705b5e8fc0229981c84e763e1c0b6f7fe028ebfc29f9d7a021df0c3b150da1aec81126a4a2ba33ba99090148beaf4edbb6a395af2c876c4abbf2 WHIRLPOOL c9f1e85f8f62e8c2d6533f18a2f6f07f883bbe7564e1d1a19845ba86e54ece3a47136b017fa0751b4d8805b5ab5407d15468da3ab2d21d930a73f35bee6e0a33
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iEYEAREIAAYFAlHoeMYACgkQVWmRsqeSphOOaACfXkVCsvBXi2ZyyX6+wUStfabj
+M6gAnibwBD97xDv8lDyx3ZcDV14iWItP
+=CGXg
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/dzen/dzen-0.9.5.ebuild b/x11-misc/dzen/dzen-0.9.5.ebuild
new file mode 100644
index 000000000000..901096538011
--- /dev/null
+++ b/x11-misc/dzen/dzen-0.9.5.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/dzen/dzen-0.9.5.ebuild,v 1.1 2013/07/18 23:22:45 jer Exp $
+
+EAPI=5
+inherit eutils toolchain-funcs vcs-snapshot
+
+COMMITID="f7907da3a42a6d59e27ede88f5f01e4e41c4c9e0"
+
+DESCRIPTION="a general purpose messaging, notification and menuing program for X11"
+HOMEPAGE="https://github.com/robm/dzen"
+SRC_URI="https://github.com/robm/${PN}/tarball/${COMMITID} -> ${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+IUSE="minimal xft xinerama xpm"
+SLOT="2"
+
+RDEPEND="
+	x11-libs/libX11
+	xft? ( x11-libs/libXft )
+	xinerama? ( x11-libs/libXinerama )
+	xpm? ( x11-libs/libXpm )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-proto/xproto
+	xinerama? ( x11-proto/xineramaproto )
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-off-by-one.patch
+
+	sed -i \
+		-e "s:-L/usr/lib::g" \
+		-e '/^CC.*/d' \
+		-e 's:-Os::g' \
+		-e 's:/usr/local:/usr:g' \
+		-e 's:CFLAGS =:CFLAGS +=:g' \
+		-e 's:^LDFLAGS =:LDFLAGS +=:' \
+		config.mk gadgets/config.mk || die
+
+	sed -i \
+		-e '/strip/d' \
+		-e 's:^	@:	:g' \
+		Makefile gadgets/Makefile \
+		|| die
+}
+
+src_configure() {
+	if use xinerama ; then
+		sed -e "/^LIBS/s/$/\ -lXinerama/" \
+			-e "/^CFLAGS/s/$/\ -DDZEN_XINERAMA/" \
+			-i config.mk || die
+	fi
+	if use xpm ; then
+		sed -e "/^LIBS/s/$/\ -lXpm/" \
+			-e "/^CFLAGS/s/$/\ -DDZEN_XPM/" \
+			-i config.mk || die
+	fi
+	if use xft ; then
+		sed -e "/^LIBS/s/$/\ \`pkg-config --libs xft\`/" \
+			-e "/^CFLAGS/s/$/\ -DDZEN_XFT \`pkg-config --cflags xft\`/" \
+			-i config.mk || die
+	fi
+
+	tc-export CC
+}
+
+src_compile() {
+	default
+	use minimal || emake -C gadgets
+}
+
+src_install() {
+	default
+	dodoc README || die
+
+	if ! use minimal ; then
+		emake -C gadgets DESTDIR="${D}" install
+		dobin gadgets/*.sh
+		dodoc gadgets/README*
+	fi
+}
diff --git a/x11-misc/dzen/files/dzen-0.9.5-off-by-one.patch b/x11-misc/dzen/files/dzen-0.9.5-off-by-one.patch
new file mode 100644
index 000000000000..d9bba1ce9e8b
--- /dev/null
+++ b/x11-misc/dzen/files/dzen-0.9.5-off-by-one.patch
@@ -0,0 +1,11 @@
+--- a/main.c
++++ b/main.c
+@@ -109,7 +109,7 @@
+ 		rem = NULL;
+ 	}
+ 	while(off < len) {
+-		if(i > MAX_LINE_LEN) {
++		if(i = MAX_LINE_LEN - 1) {
+ 			outbuf[i] = '\0';
+ 			return ++off;
+ 		}