From 29596270c60044047ffa139daadbd7a9a7bf1299 Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Krier?= Date: Wed, 27 Sep 2006 18:21:11 +0000 Subject: [PATCH] x11-wm/dwm: Version bump svn path=/sunrise/; revision=1355 --- x11-wm/dwm/ChangeLog | 4 ++ x11-wm/dwm/Manifest | 24 +++++-- x11-wm/dwm/dwm-1.7.1.ebuild | 77 ++++++++++++++++++++++ x11-wm/dwm/files/digest-dwm-1.7.1 | 3 + x11-wm/dwm/files/dwm-1.7.1-config_mk.patch | 11 ++++ x11-wm/dwm/files/dwm-1.7.1-makefile.patch | 10 +++ 6 files changed, 125 insertions(+), 4 deletions(-) create mode 100644 x11-wm/dwm/dwm-1.7.1.ebuild create mode 100644 x11-wm/dwm/files/digest-dwm-1.7.1 create mode 100644 x11-wm/dwm/files/dwm-1.7.1-config_mk.patch create mode 100644 x11-wm/dwm/files/dwm-1.7.1-makefile.patch diff --git a/x11-wm/dwm/ChangeLog b/x11-wm/dwm/ChangeLog index be80a650b..3c4d9e184 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: $ + 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 + 26 Sep 2006; Cedric Krier -dwm-1.6.ebuild, -files/dwm-1.6-config_mk.patch, -files/dwm-1.6-makefile.patch, +dwm-1.7.ebuild, +files/dwm-1.7-config_mk.patch, diff --git a/x11-wm/dwm/Manifest b/x11-wm/dwm/Manifest index c867b943e..62dc529d5 100644 --- a/x11-wm/dwm/Manifest +++ b/x11-wm/dwm/Manifest @@ -6,15 +6,28 @@ AUX dwm-1.7-makefile.patch 232 RMD160 8d9e81e8f13bb5497b6c212309268c8f7ac49b81 S MD5 097e6bf48d25cdbbc124287b164a7c39 files/dwm-1.7-makefile.patch 232 RMD160 8d9e81e8f13bb5497b6c212309268c8f7ac49b81 files/dwm-1.7-makefile.patch 232 SHA256 7324a956b06ba098478599e4d4a8acb199f18a74dcbcd03d05c007306a14963e files/dwm-1.7-makefile.patch 232 +AUX dwm-1.7.1-config_mk.patch 381 RMD160 fa3e9958a4f9a757e47876f698ff5e8c42113b03 SHA1 4f322c72f773df3c31ea254c8be8c98f07fbd136 SHA256 3f5f66ae7260bbb953537dd600a4a24e30665858fb4685413cf5067fca5e5090 +MD5 8fdc333297d668786f4c0aa5070d80ff files/dwm-1.7.1-config_mk.patch 381 +RMD160 fa3e9958a4f9a757e47876f698ff5e8c42113b03 files/dwm-1.7.1-config_mk.patch 381 +SHA256 3f5f66ae7260bbb953537dd600a4a24e30665858fb4685413cf5067fca5e5090 files/dwm-1.7.1-config_mk.patch 381 +AUX dwm-1.7.1-makefile.patch 236 RMD160 d3b5c31b74b362143806d9fc016b3db34ee81b55 SHA1 09801bb828b4ce3abef7a2c15caa7fb1f6f71044 SHA256 9b297e857210539eda1ff5629d3f4f6284b886a5c29bc3f8b447459babdc8ea9 +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 +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 +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 +SHA256 b8173773af4a23e9dd712b2caef12c0bc1e16c7c213ef5bc507d4d9ea3757cb3 dwm-1.7.1.ebuild 2095 EBUILD dwm-1.7.ebuild 2095 RMD160 4be15f258b7ac600086da37c057aa9e4627624f1 SHA1 ab3eea6e00a4efd6121133375c6bf4fbbd8c38c8 SHA256 b8173773af4a23e9dd712b2caef12c0bc1e16c7c213ef5bc507d4d9ea3757cb3 MD5 3e0a59d2f0377dcd0dc106d35e5976e3 dwm-1.7.ebuild 2095 RMD160 4be15f258b7ac600086da37c057aa9e4627624f1 dwm-1.7.ebuild 2095 SHA256 b8173773af4a23e9dd712b2caef12c0bc1e16c7c213ef5bc507d4d9ea3757cb3 dwm-1.7.ebuild 2095 -MISC ChangeLog 3661 RMD160 49b4e6ffe5eae42064e88248f95359c4b07eb9fb SHA1 1274e48273f8a8bd54256bc6f2502c10cea010d2 SHA256 ae35215c04e5bb1cba903489ec14d59857a0c56fc4913e8b169c7b44a18249cb -MD5 6190cf079614a82e7ad20f0b2a53cd67 ChangeLog 3661 -RMD160 49b4e6ffe5eae42064e88248f95359c4b07eb9fb ChangeLog 3661 -SHA256 ae35215c04e5bb1cba903489ec14d59857a0c56fc4913e8b169c7b44a18249cb ChangeLog 3661 +MISC ChangeLog 3815 RMD160 851a2331e7e930c54cb0b6aed60b8cee52f38943 SHA1 3cfabd016bf9e413f22b2b01a1be1dc17a5e71e3 SHA256 1296b26e29b233b8c37ce2394234192288f5f9d97bbda45e3b4fb4fb590a6deb +MD5 9a6bafd95f3edf9a881e2f06773c4cc2 ChangeLog 3815 +RMD160 851a2331e7e930c54cb0b6aed60b8cee52f38943 ChangeLog 3815 +SHA256 1296b26e29b233b8c37ce2394234192288f5f9d97bbda45e3b4fb4fb590a6deb ChangeLog 3815 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170 @@ -22,3 +35,6 @@ SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 metadata MD5 36a5818592f4a401845c672a02e26e03 files/digest-dwm-1.7 220 RMD160 a08d8487ca1d9c33032482aaedbf404bf11f0b92 files/digest-dwm-1.7 220 SHA256 d5062344cbe476d25f798eb561404720200a9e2e76a679fef3dbef37c3a33e41 files/digest-dwm-1.7 220 +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 diff --git a/x11-wm/dwm/dwm-1.7.1.ebuild b/x11-wm/dwm/dwm-1.7.1.ebuild new file mode 100644 index 000000000..8bf71946f --- /dev/null +++ b/x11-wm/dwm/dwm-1.7.1.ebuild @@ -0,0 +1,77 @@ +# 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}-config_mk.patch" + 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.7.1 b/x11-wm/dwm/files/digest-dwm-1.7.1 new file mode 100644 index 000000000..b7385e5b6 --- /dev/null +++ b/x11-wm/dwm/files/digest-dwm-1.7.1 @@ -0,0 +1,3 @@ +MD5 cbc842bace928e4f3c3f3ed9fcd82fda dwm-1.7.1.tar.gz 17282 +RMD160 6d61ff4a542a7fb2067b3e2c33b06e431ef21b7f dwm-1.7.1.tar.gz 17282 +SHA256 cf236cf1c9316bb609cac4980fb3456a1f771dcea8c71361420fb218ed6157f1 dwm-1.7.1.tar.gz 17282 diff --git a/x11-wm/dwm/files/dwm-1.7.1-config_mk.patch b/x11-wm/dwm/files/dwm-1.7.1-config_mk.patch new file mode 100644 index 000000000..2c925af11 --- /dev/null +++ b/x11-wm/dwm/files/dwm-1.7.1-config_mk.patch @@ -0,0 +1,11 @@ +--- dwm-1.7.1~/config.mk 2006-09-27 20:16:35.000000000 +0200 ++++ dwm-1.7.1/config.mk 2006-09-27 20:16:52.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 --git a/x11-wm/dwm/files/dwm-1.7.1-makefile.patch b/x11-wm/dwm/files/dwm-1.7.1-makefile.patch new file mode 100644 index 000000000..9ab291c6e --- /dev/null +++ b/x11-wm/dwm/files/dwm-1.7.1-makefile.patch @@ -0,0 +1,10 @@ +--- dwm-1.7.1~/Makefile 2006-09-27 20:16:35.000000000 +0200 ++++ dwm-1.7.1/Makefile 2006-09-27 20:16:54.000000000 +0200 +@@ -28,7 +28,6 @@ + dwm: ${OBJ} + @echo LD $@ + @${LD} -o $@ ${OBJ} ${LDFLAGS} +- @strip $@ + + clean: + @echo cleaning -- 2.43.2