Version bump by Dmitry Potapov (bug #395707).

Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64

3 files changed, 98 insertions, 2 deletions

diff --git a/x11-wm/dwm/ChangeLog b/x11-wm/dwm/ChangeLog
index 9962d984369c..1c1eb7e35a0e 100644
--- a/x11-wm/dwm/ChangeLog
+++ b/x11-wm/dwm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/dwm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/dwm/ChangeLog,v 1.75 2011/11/06 23:09:08 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/dwm/ChangeLog,v 1.76 2011/12/23 01:44:46 jer Exp $
+
+*dwm-6.0 (23 Dec 2011)
+
+  23 Dec 2011; Jeroen Roovers <jer@gentoo.org> +dwm-6.0.ebuild:
+  Version bump by Dmitry Potapov (bug #395707).
 
   06 Nov 2011; Brent Baude <ranger@gentoo.org> dwm-5.9.ebuild:
   Marking dwm-5.9 ppc for bug 386083
diff --git a/x11-wm/dwm/Manifest b/x11-wm/dwm/Manifest
index b1162682f6e5..0c4fd238275e 100644
--- a/x11-wm/dwm/Manifest
+++ b/x11-wm/dwm/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX dwm-session 312 RMD160 6d3792a0f5374ba6bd8aeb84aa31a86b598e2416 SHA1 a87590c2cbb5a857e8875c88fa4d2e8090cf31d1 SHA256 bc0e60687f719f2613492f15180c3327b7b9560f53f09a52f0e763548f2221ac
 AUX dwm-session2 170 RMD160 4f131eba402a1d0f4f759546bba7f62aa96283e1 SHA1 88f458b328decbc947584b48481f7955ffd8c0d2 SHA256 b25088c71daa7ec759bf1ae758b8ef528dcced6cfb642ccdcb69ffa8644dc5ab
 AUX dwm.desktop 133 RMD160 b03ed0e17001e58a94e7034e33d42ba50500b72c SHA1 26f764cdaa5bde8284a0cd22c08e67ce11d169b2 SHA256 1a1ae9d1d5eb4747a1241798969c5b151ec66901a62af683304c6f23e4ccc30e
@@ -5,9 +8,18 @@ DIST dwm-5.6.1.tar.gz 19415 RMD160 c12f6cff053db68623396ccc5c8a8570ddb5baa0 SHA1
 DIST dwm-5.7.2.tar.gz 19989 RMD160 8fc6cc10ca6b0c6ae69fdf0f6122e015b849c7a1 SHA1 f374ab15033500276eab61ac5002b2cd05f8cbc7 SHA256 32bffe33d5da9cec55de7e6b215568ff9950cc24b93aca72e7097437a2bfcde0
 DIST dwm-5.8.2.tar.gz 20326 RMD160 5cdc22af7b7d223ef935dc65eae7c8f3630b2b76 SHA1 ee4fecee6b404969884088cafba14d538c77b9f9 SHA256 c5243bc792e3ff3bb19f0b5fa45f6f98b40254af8757a010d1640a4d9d389b66
 DIST dwm-5.9.tar.gz 20517 RMD160 92af278597db706fb2a4b63aa9169a3ef612cd2c SHA1 45d011b70cee0208c43b756650c6f736e0c8661b SHA256 2dcdd5a2a233c385ef776017263164a288886561b6bf4d6b984562f5f02fe232
+DIST dwm-6.0.tar.gz 20810 RMD160 6ecd03a2fc8a6f9fd436e8f58dedc305c4a5bbf7 SHA1 35346f873a27f219ae266594b3690407f95d06ef SHA256 b2b9483de69259eeea56844899bb2385158d3e79a42d82b10c142099fc8eeb56
 EBUILD dwm-5.6.1.ebuild 2143 RMD160 cf56602d45e95ed33f3a500f46aaa644930d5150 SHA1 c3ccb1e6394e4f860c495202bacd104512b57997 SHA256 6f1b2c707831363eb3ad0bf85e105539339c2257d76468819764c35891ad2434
 EBUILD dwm-5.7.2.ebuild 2231 RMD160 04bf33b356398cb0aa22444d1d79dc51f11bdfcd SHA1 16e160df62fc8c82ec82638174734fc62ddec6d1 SHA256 eab438cf37d2be96a3b8f268914c8f58dfa9455ba19dd3dff2733fc3aacadc07
 EBUILD dwm-5.8.2.ebuild 2222 RMD160 67b03624b243a8710f2669f2f1df34fc434bb4b5 SHA1 37c87114cbfb373ffb5e55e37f1c2bee0c0c80d9 SHA256 3a66af22905e0c2a9413b117b39de53559c6fd29399f5c70b338dc29781aab9d
 EBUILD dwm-5.9.ebuild 2119 RMD160 f000b4a12274afd401b2d96fba0ee43b368221ff SHA1 8653a65cd8a0610ce0d81b596281ebb7096524a3 SHA256 9535f27e053787d103443ee5c80b9b3fa3be33af1a12fddb430ccee872e6d909
-MISC ChangeLog 8155 RMD160 c1ffafddd7d600a16cde46e86ccc6201ec11c58a SHA1 48673ca0be0211f47d84eb99848b90eff8997221 SHA256 59c112ccd3cc417e75e3d96557adaee57e46784d515de91af7f238d3969bfea0
+EBUILD dwm-6.0.ebuild 2119 RMD160 91cd5cdde82f07ea687afd6ff96cc24fcd278a40 SHA1 0608ecfab277fcee65b12d104c4522f6c94c8e1b SHA256 e06255f4a7aae94d7e32f97e8389450f97baeb9a79f9b149ce47fa81dc639409
+MISC ChangeLog 8289 RMD160 488c53307a73aafbdecd28c5694c1870d13820b5 SHA1 503d52fd821e24445c0920281b63d59402180afb SHA256 fa3c68e7fe2d2070aa09d58caabe078445dc97b35d86527e3cee357728299d8c
 MISC metadata.xml 464 RMD160 6a015eb09888ce94ac15fa060db3245003086bd3 SHA1 ce1903fc125b85fb2d17a1586dad6e2a634908d2 SHA256 2fc98596b93f4b722956c930fc9bc1dc52cd51c316e6c4ff21fd8e5086d2f0d4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk7z3RQACgkQVWmRsqeSphO1SwCeJQ7rA3HQfHNWiTZvm0lRTyrW
+6ycAnixnKLhbggife7JuciYGk9Inm09S
+=wm6Q
+-----END PGP SIGNATURE-----
diff --git a/x11-wm/dwm/dwm-6.0.ebuild b/x11-wm/dwm/dwm-6.0.ebuild
new file mode 100644
index 000000000000..b8820878aade
--- /dev/null
+++ b/x11-wm/dwm/dwm-6.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/dwm/dwm-6.0.ebuild,v 1.1 2011/12/23 01:44:46 jer Exp $
+
+EAPI="4"
+
+inherit toolchain-funcs savedconfig
+
+DESCRIPTION="a dynamic window manager for X11"
+HOMEPAGE="http://www.suckless.org/dwm/"
+SRC_URI="http://dl.suckless.org/dwm/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="xinerama"
+
+DEPEND="x11-libs/libX11
+	xinerama? (
+		x11-proto/xineramaproto
+		x11-libs/libXinerama
+		)"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -i \
+		-e "s/CFLAGS = -std=c99 -pedantic -Wall -Os/CFLAGS += -std=c99 -pedantic -Wall -g/" \
+		-e "/^LDFLAGS/{s|=|+=|g;s|-s ||g}" \
+		-e "s/#XINERAMALIBS =/XINERAMALIBS ?=/" \
+		-e "s/#XINERAMAFLAGS =/XINERAMAFLAGS ?=/" \
+		-e "s@/usr/X11R6/include@/usr/include/X11@" \
+		-e "s@/usr/X11R6/lib@/usr/lib@" \
+		config.mk || die "sed failed"
+
+	if use savedconfig; then
+		restore_config config.h
+	fi
+}
+
+src_compile() {
+	local msg
+	use savedconfig && msg=", please check the configfile"
+	if use xinerama; then
+		emake CC=$(tc-getCC)
+	else
+		emake CC=$(tc-getCC) XINERAMAFLAGS="" XINERAMALIBS=""
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="/usr" install
+
+	insinto /usr/share/${PN}
+	newins config.h ${PF}.config.h
+
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}"/dwm-session2 dwm
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/dwm.desktop
+
+	dodoc README
+
+	save_config config.h
+}
+
+pkg_postinst() {
+	einfo "This ebuild has support for user defined configs"
+	einfo "Please read this ebuild for more details and re-emerge as needed"
+	einfo "if you want to add or remove functionality for ${PN}"
+	if ! has_version x11-misc/dmenu; then
+		elog "Installing ${PN} without x11-misc/dmenu"
+		einfo "To have a menu you can install x11-misc/dmenu"
+	fi
+	einfo "You can custom status bar with a script in HOME/.dwm/dwmrc"
+	einfo "the ouput is redirected to the standard input of dwm"
+	einfo "Since dwm-5.4, status info in the bar must be set like this:"
+	einfo "xsetroot -name \"\`date\` \`uptime | sed 's/.*,//'\`\""
+}