From 2c51ffce610c3fe376eafe9c07e2587fc543975c Mon Sep 17 00:00:00 2001 From: Cédric Krier Date: Thu, 5 Oct 2006 20:28:15 +0000 Subject: x11-wm/dwm: Version bump svn path=/sunrise/; revision=1422 --- x11-wm/dwm/ChangeLog | 4 ++ x11-wm/dwm/Manifest | 20 +++++++-- x11-wm/dwm/dwm-1.8.ebuild | 76 +++++++++++++++++++++++++++++++++ x11-wm/dwm/files/digest-dwm-1.8 | 3 ++ x11-wm/dwm/files/dwm-1.8-makefile.patch | 23 ++++++++++ 5 files changed, 122 insertions(+), 4 deletions(-) create mode 100644 x11-wm/dwm/dwm-1.8.ebuild create mode 100644 x11-wm/dwm/files/digest-dwm-1.8 create mode 100644 x11-wm/dwm/files/dwm-1.8-makefile.patch (limited to 'x11-wm') diff --git a/x11-wm/dwm/ChangeLog b/x11-wm/dwm/ChangeLog index 3c4d9e184..3bd13c448 100644 --- a/x11-wm/dwm/ChangeLog +++ b/x11-wm/dwm/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 05 Oct 2006; Cedric Krier +dwm-1.8.ebuild, + +files/dwm-1.8-makefile.patch: + Version bump + 27 Sep 2006; Cedric Krier +dwm-1.7.1.ebuild, +files/dwm-1.7.1-config_mk.patch, +files/dwm-1.7.1-makefile.patch: Version bump diff --git a/x11-wm/dwm/Manifest b/x11-wm/dwm/Manifest index 62dc529d5..1c315e5eb 100644 --- a/x11-wm/dwm/Manifest +++ b/x11-wm/dwm/Manifest @@ -14,8 +14,13 @@ AUX dwm-1.7.1-makefile.patch 236 RMD160 d3b5c31b74b362143806d9fc016b3db34ee81b55 MD5 44b2f558fe45b8a793850654e0414cbf files/dwm-1.7.1-makefile.patch 236 RMD160 d3b5c31b74b362143806d9fc016b3db34ee81b55 files/dwm-1.7.1-makefile.patch 236 SHA256 9b297e857210539eda1ff5629d3f4f6284b886a5c29bc3f8b447459babdc8ea9 files/dwm-1.7.1-makefile.patch 236 +AUX dwm-1.8-makefile.patch 699 RMD160 af34018a9822c55c55f33004df8ad6e2b03d2e76 SHA1 de96936663bad504ae2ba16f7c67f9e3fb34f018 SHA256 0bb0ff766b45c34670229b998c115485d0928a0260386273e08f512f7f7f67bf +MD5 872c6bd72adcb2f305b6b9901617a58b files/dwm-1.8-makefile.patch 699 +RMD160 af34018a9822c55c55f33004df8ad6e2b03d2e76 files/dwm-1.8-makefile.patch 699 +SHA256 0bb0ff766b45c34670229b998c115485d0928a0260386273e08f512f7f7f67bf files/dwm-1.8-makefile.patch 699 DIST dwm-1.7.1.tar.gz 17282 RMD160 6d61ff4a542a7fb2067b3e2c33b06e431ef21b7f SHA1 34a215c52bafde903ed3b96b81be51dbcd31c486 SHA256 cf236cf1c9316bb609cac4980fb3456a1f771dcea8c71361420fb218ed6157f1 DIST dwm-1.7.tar.gz 17251 RMD160 99c1d942d7a3b716967d9ebe3ee6ef6103897706 SHA1 490e0bd8a9542b9475cf43db7b8bc72fed1b0d14 SHA256 28e77c4b9ac35a7184706dab968f6364cea91dad246315ecbfa2020a28a76d9f +DIST dwm-1.8.tar.gz 18036 RMD160 c3c6c7d44cb3d3fa0f64932cd795b13c5fec389b SHA1 a961ef01fa4173125b815ceed598f8ab9280e3aa SHA256 c57803d6cf362717a12d01877f143f3ff7ea7605a2ee63651ca9051228061d22 EBUILD dwm-1.7.1.ebuild 2095 RMD160 4be15f258b7ac600086da37c057aa9e4627624f1 SHA1 ab3eea6e00a4efd6121133375c6bf4fbbd8c38c8 SHA256 b8173773af4a23e9dd712b2caef12c0bc1e16c7c213ef5bc507d4d9ea3757cb3 MD5 3e0a59d2f0377dcd0dc106d35e5976e3 dwm-1.7.1.ebuild 2095 RMD160 4be15f258b7ac600086da37c057aa9e4627624f1 dwm-1.7.1.ebuild 2095 @@ -24,10 +29,14 @@ EBUILD dwm-1.7.ebuild 2095 RMD160 4be15f258b7ac600086da37c057aa9e4627624f1 SHA1 MD5 3e0a59d2f0377dcd0dc106d35e5976e3 dwm-1.7.ebuild 2095 RMD160 4be15f258b7ac600086da37c057aa9e4627624f1 dwm-1.7.ebuild 2095 SHA256 b8173773af4a23e9dd712b2caef12c0bc1e16c7c213ef5bc507d4d9ea3757cb3 dwm-1.7.ebuild 2095 -MISC ChangeLog 3815 RMD160 851a2331e7e930c54cb0b6aed60b8cee52f38943 SHA1 3cfabd016bf9e413f22b2b01a1be1dc17a5e71e3 SHA256 1296b26e29b233b8c37ce2394234192288f5f9d97bbda45e3b4fb4fb590a6deb -MD5 9a6bafd95f3edf9a881e2f06773c4cc2 ChangeLog 3815 -RMD160 851a2331e7e930c54cb0b6aed60b8cee52f38943 ChangeLog 3815 -SHA256 1296b26e29b233b8c37ce2394234192288f5f9d97bbda45e3b4fb4fb590a6deb ChangeLog 3815 +EBUILD dwm-1.8.ebuild 2052 RMD160 c023b6e6148a8f816115d79b421907ed66e38c3b SHA1 69201d2793ba09f416f3ba765988b54618068e19 SHA256 0d2a7e11c8d06ec252b46fa5d39dada4586116e5b21f46d097f3303ccbd3b166 +MD5 5494b2605a5801f20fce5e25239f8b21 dwm-1.8.ebuild 2052 +RMD160 c023b6e6148a8f816115d79b421907ed66e38c3b dwm-1.8.ebuild 2052 +SHA256 0d2a7e11c8d06ec252b46fa5d39dada4586116e5b21f46d097f3303ccbd3b166 dwm-1.8.ebuild 2052 +MISC ChangeLog 3931 RMD160 26502fa4f50c350d8802795d6237850300be4aa3 SHA1 ac3d16e1727a046f5712eee0c3ed9bdeb67ae9e8 SHA256 bb64d059554a4b5d068ce16c51feac59db68b3edfd67a0e55252df5d858070a2 +MD5 2bc89ab8ac2e04b5210b04119b1e2787 ChangeLog 3931 +RMD160 26502fa4f50c350d8802795d6237850300be4aa3 ChangeLog 3931 +SHA256 bb64d059554a4b5d068ce16c51feac59db68b3edfd67a0e55252df5d858070a2 ChangeLog 3931 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170 @@ -38,3 +47,6 @@ SHA256 d5062344cbe476d25f798eb561404720200a9e2e76a679fef3dbef37c3a33e41 files/di MD5 f50db4c31d76c251ae14b62c7fb3a264 files/digest-dwm-1.7.1 226 RMD160 60fdfc8a5234196ee8fbb403c77c1c6cc6112463 files/digest-dwm-1.7.1 226 SHA256 7a391e5a8f6ef292e321193941d8e5cab4e701e0c0b9b2d3dbd6ad371594536b files/digest-dwm-1.7.1 226 +MD5 4506b0824986096459db51e3535b8677 files/digest-dwm-1.8 220 +RMD160 b3bc6a928d7a37e54b3be99d78c4586fc05ecbc6 files/digest-dwm-1.8 220 +SHA256 cd6fbf70ab2e779c317ad42014c76ee77a1e9886ce0db80bde9b351f34b0d22c files/digest-dwm-1.8 220 diff --git a/x11-wm/dwm/dwm-1.8.ebuild b/x11-wm/dwm/dwm-1.8.ebuild new file mode 100644 index 000000000..259e7c638 --- /dev/null +++ b/x11-wm/dwm/dwm-1.8.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit eutils toolchain-funcs + +DESCRIPTION="a dynamic window manager for X11" +HOMEPAGE="http://www.shortest.de/view/dynamic+window+manager" +SRC_URI="http://www.shortest.de/download/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~x86" +IUSE="savedconfig" + +DEPEND="x11-libs/libX11" +RDEPEND="${DEPEND}" + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}/${P}-makefile.patch" + + if use savedconfig; then + local conf root + [[ -r config.h ]] && rm config.h + for conf in ${PF} ${P} ${PN}; do + for root in "${PORTAGE_CONFIGROOT}" "${ROOT}" /; do + configfile=${root}etc/portage/savedconfig/${conf}.config.h + if [[ -r ${configfile} ]]; then + elog "Found your ${configfile} and using it." + cp ${configfile} "${S}"/config.h + return 0 + fi + done + done + ewarn "Could not locate user configfile, so we will save a default one." + fi +} + +src_compile() { + local msg + use savedconfig && msg=", please check the configfile" + emake CC=$(tc-getCC) || die "emake failed${msg}" +} + +src_install() { + emake DESTDIR="${D}" PREFIX="/usr" install || die "emake install failed" + + insinto /usr/share/${PN} + newins config.h ${PF}.config.h + + dodoc README +} + +pkg_preinst() { + mv "${D}"/usr/share/${PN}/${PF}.config.h "${T}"/ +} + +pkg_postinst() { + if use savedconfig; then + local config_dir="${PORTAGE_CONFIGROOT:-${ROOT}}/etc/portage/savedconfig" + elog "Saving this build config to ${config_dir}/${PF}.config.h" + einfo "Read this ebuild for more info on how to take advantage of this option." + mkdir -p "${config_dir}" + cp "${T}"/${PF}.config.h "${config_dir}"/${PF}.config.h + fi + 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 +} diff --git a/x11-wm/dwm/files/digest-dwm-1.8 b/x11-wm/dwm/files/digest-dwm-1.8 new file mode 100644 index 000000000..1e857620c --- /dev/null +++ b/x11-wm/dwm/files/digest-dwm-1.8 @@ -0,0 +1,3 @@ +MD5 46dc8a95e315d2373df60e13cc85b533 dwm-1.8.tar.gz 18036 +RMD160 c3c6c7d44cb3d3fa0f64932cd795b13c5fec389b dwm-1.8.tar.gz 18036 +SHA256 c57803d6cf362717a12d01877f143f3ff7ea7605a2ee63651ca9051228061d22 dwm-1.8.tar.gz 18036 diff --git a/x11-wm/dwm/files/dwm-1.8-makefile.patch b/x11-wm/dwm/files/dwm-1.8-makefile.patch new file mode 100644 index 000000000..4149dc1eb --- /dev/null +++ b/x11-wm/dwm/files/dwm-1.8-makefile.patch @@ -0,0 +1,23 @@ +diff -ru dwm-1.8~/config.mk dwm-1.8/config.mk +--- dwm-1.8~/config.mk 2006-10-05 22:18:46.000000000 +0200 ++++ dwm-1.8/config.mk 2006-10-05 22:19:13.000000000 +0200 +@@ -15,7 +15,7 @@ + LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 + + # flags +-CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\" ++CFLAGS += ${INCS} -DVERSION=\"${VERSION}\" + LDFLAGS = ${LIBS} + #CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\" + #LDFLAGS = -g ${LIBS} +diff -ru dwm-1.8~/Makefile dwm-1.8/Makefile +--- dwm-1.8~/Makefile 2006-10-05 22:18:46.000000000 +0200 ++++ dwm-1.8/Makefile 2006-10-05 22:19:09.000000000 +0200 +@@ -28,7 +28,6 @@ + dwm: ${OBJ} + @echo LD $@ + @${LD} -o $@ ${OBJ} ${LDFLAGS} +- @strip $@ + + clean: + @echo cleaning -- cgit v1.2.3-65-gdbad