From 7232f304099a3690192ebeeff7bfaf50a2da1960 Mon Sep 17 00:00:00 2001 From: Michael Weber Date: Sun, 29 Jan 2012 01:49:55 +0000 Subject: Version bump to new tarball, remove old version, EAPI-4 (Portage version: 2.1.10.44/cvs/Linux x86_64) --- x11-wm/cwm/ChangeLog | 10 +++++++- x11-wm/cwm/cwm-20110726.ebuild | 34 --------------------------- x11-wm/cwm/cwm-20110908-r1.ebuild | 35 ---------------------------- x11-wm/cwm/cwm-20111229.ebuild | 35 ++++++++++++++++++++++++++++ x11-wm/cwm/cwm-99999999.ebuild | 15 ++++++------ x11-wm/cwm/files/cwm-20110213-Makefile.patch | 35 ---------------------------- x11-wm/cwm/files/cwm-20111229-Makefile.patch | 11 +++++++++ 7 files changed, 63 insertions(+), 112 deletions(-) delete mode 100644 x11-wm/cwm/cwm-20110726.ebuild delete mode 100644 x11-wm/cwm/cwm-20110908-r1.ebuild create mode 100644 x11-wm/cwm/cwm-20111229.ebuild delete mode 100644 x11-wm/cwm/files/cwm-20110213-Makefile.patch create mode 100644 x11-wm/cwm/files/cwm-20111229-Makefile.patch (limited to 'x11-wm') diff --git a/x11-wm/cwm/ChangeLog b/x11-wm/cwm/ChangeLog index a1355a049ee5..d892c9e42762 100644 --- a/x11-wm/cwm/ChangeLog +++ b/x11-wm/cwm/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for x11-wm/cwm # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/cwm/ChangeLog,v 1.29 2012/01/28 15:01:07 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/cwm/ChangeLog,v 1.30 2012/01/29 01:49:55 xmw Exp $ + +*cwm-20111229 (29 Jan 2012) + + 29 Jan 2012; Michael Weber + -files/cwm-20110213-Makefile.patch, -cwm-20110726.ebuild, + -cwm-20110908-r1.ebuild, +cwm-20111229.ebuild, + +files/cwm-20111229-Makefile.patch, cwm-99999999.ebuild: + Version bump to new tarball, remove old version, EAPI-4 28 Jan 2012; Pawel Hajdan jr cwm-20110913-r1.ebuild: x86 stable wrt bug #400535 diff --git a/x11-wm/cwm/cwm-20110726.ebuild b/x11-wm/cwm/cwm-20110726.ebuild deleted file mode 100644 index 417e55dcbe2a..000000000000 --- a/x11-wm/cwm/cwm-20110726.ebuild +++ /dev/null @@ -1,34 +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/cwm/cwm-20110726.ebuild,v 1.1 2011/08/04 22:27:34 xmw Exp $ - -EAPI=2 - -inherit eutils toolchain-funcs - -DESCRIPTION="OpenBSD fork of calmwm, a clean and lightweight window manager" -HOMEPAGE="http://www.openbsd.org/cgi-bin/cvsweb/xenocara/app/cwm/ - http://github.com/chneukirchen/cwm" -SRC_URI="mirror://gentoo/${P}.tar.bz2" - -LICENSE="ISC" -SLOT="0" -KEYWORDS="~amd64 ~arm ~sparc ~x86" -IUSE="" - -RDEPEND="x11-libs/libXft - x11-libs/libXinerama - x11-libs/libXrandr" -DEPEND="${RDEPEND} - dev-util/pkgconfig - sys-devel/bison" - -src_prepare() { - epatch "${FILESDIR}"/${P}-Makefile.patch - export LDADD="${LDFLAGS}" - tc-export CC -} - -src_install() { - emake DESTDIR="${D}" install || die -} diff --git a/x11-wm/cwm/cwm-20110908-r1.ebuild b/x11-wm/cwm/cwm-20110908-r1.ebuild deleted file mode 100644 index ddd9bebb18dc..000000000000 --- a/x11-wm/cwm/cwm-20110908-r1.ebuild +++ /dev/null @@ -1,35 +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/cwm/cwm-20110908-r1.ebuild,v 1.1 2011/10/06 00:00:59 xmw Exp $ - -EAPI=2 - -inherit eutils toolchain-funcs - -DESCRIPTION="OpenBSD fork of calmwm, a clean and lightweight window manager" -HOMEPAGE="http://www.openbsd.org/cgi-bin/cvsweb/xenocara/app/cwm/ - http://github.com/chneukirchen/cwm" -SRC_URI="mirror://gentoo/${P}.tar.bz2" - -LICENSE="ISC" -SLOT="0" -KEYWORDS="~amd64 ~arm ~sparc ~x86" -IUSE="" - -RDEPEND="x11-libs/libXft - x11-libs/libXinerama - x11-libs/libXrandr" -DEPEND="${RDEPEND} - dev-util/pkgconfig - sys-devel/bison" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-20110726-Makefile.patch - export LDADD="${LDFLAGS}" - tc-export CC -} - -src_install() { - emake DESTDIR="${D}" install || die - make_session_desktop ${PN} ${PN} -} diff --git a/x11-wm/cwm/cwm-20111229.ebuild b/x11-wm/cwm/cwm-20111229.ebuild new file mode 100644 index 000000000000..40343ce377ed --- /dev/null +++ b/x11-wm/cwm/cwm-20111229.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-wm/cwm/cwm-20111229.ebuild,v 1.1 2012/01/29 01:49:55 xmw Exp $ + +EAPI=4 + +inherit eutils toolchain-funcs + +DESCRIPTION="OpenBSD fork of calmwm, a clean and lightweight window manager" +HOMEPAGE="http://www.openbsd.org/cgi-bin/cvsweb/xenocara/app/cwm/ + http://github.com/chneukirchen/cwm" +SRC_URI="mirror://gentoo/${P}.tar.bz2" + +LICENSE="ISC" +SLOT="0" +KEYWORDS="~amd64 ~arm ~sparc ~x86" +IUSE="" + +RDEPEND="x11-libs/libXft + x11-libs/libXinerama + x11-libs/libXrandr" +DEPEND="${RDEPEND} + dev-util/pkgconfig + sys-devel/bison" + +src_prepare() { + epatch "${FILESDIR}"/${P}-Makefile.patch + tc-export CC +} + +src_install() { + emake DESTDIR="${D}" install + dodoc README + make_session_desktop ${PN} ${PN} +} diff --git a/x11-wm/cwm/cwm-99999999.ebuild b/x11-wm/cwm/cwm-99999999.ebuild index 2abe78d5fdce..b89cd9d3634e 100644 --- a/x11-wm/cwm/cwm-99999999.ebuild +++ b/x11-wm/cwm/cwm-99999999.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/cwm/cwm-99999999.ebuild,v 1.5 2011/10/06 00:20:06 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/cwm/cwm-99999999.ebuild,v 1.6 2012/01/29 01:49:55 xmw Exp $ -EAPI=2 +EAPI=4 EGIT_REPO_URI=https://github.com/chneukirchen/cwm.git EGIT_BRANCH=linux @@ -26,12 +26,13 @@ DEPEND="${RDEPEND} dev-util/pkgconfig sys-devel/bison" -src_compile() { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die +src_prpare() { + epatch "${FILESDIR}"/${PN}-20111229-Makefile.patch + tc-export CC } src_install() { - emake DESTDIR="${D}" PREFIX=/usr install || die - dodoc README || die + emake DESTDIR="${D}" install + dodoc README make_session_desktop ${PN} ${PN} } diff --git a/x11-wm/cwm/files/cwm-20110213-Makefile.patch b/x11-wm/cwm/files/cwm-20110213-Makefile.patch deleted file mode 100644 index c47ecd4225e2..000000000000 --- a/x11-wm/cwm/files/cwm-20110213-Makefile.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- cwm-20110213/Makefile.orig -+++ cwm-20110213/Makefile -@@ -15,16 +15,14 @@ - kbfunc.o mousefunc.o font.o strlcpy.o strlcat.o y.tab.o \ - strtonum.o fgetln.o - --X11BASE= /usr -- --CPPFLAGS+= -I${X11BASE}/include -I${X11BASE}/include/freetype2 -I. -+CPPFLAGS+= $(shell pkg-config --cflags-only-I xft) - --CFLAGS+= -Wall -O2 -g -+CFLAGS+= - - LDADD+= -L${X11BASE}/lib -lXft -lXrender -lX11 ${LIBXCB} -lXau -lXdmcp \ - -lfontconfig -lexpat -lfreetype -lz -lXinerama -lXrandr -lXext - --MANDIR= ${X11BASE}/man/cat -+MANDIR= /usr/share/man - MAN= cwm.1 cwmrc.5 - - CLEANFILES= cwm.cat1 cwmrc.cat5 -@@ -46,9 +45,9 @@ - $(CC) -c $(CFLAGS) $(CPPFLAGS) $< - - install: ${PROG} -- install -m 755 cwm /usr/local/bin/ -- install -m 644 cwm.1 /usr/local/man/man1 -- install -m 644 cwmrc.5 /usr/local/man/man5 -+ install -D -m 755 cwm $(DESTDIR)$(BINDIR)/cwm -+ install -D -m 644 cwm.1 $(DESTDIR)$(MANDIR)/man1/cwm.1 -+ install -D -m 644 cwmrc.5 $(DESTDIR)$(MANDIR)/man5/cwmrc.5 - - #.include - #.include diff --git a/x11-wm/cwm/files/cwm-20111229-Makefile.patch b/x11-wm/cwm/files/cwm-20111229-Makefile.patch new file mode 100644 index 000000000000..bb00c017112a --- /dev/null +++ b/x11-wm/cwm/files/cwm-20111229-Makefile.patch @@ -0,0 +1,11 @@ +--- cwm-20111229/Makefile ++++ cwm-20111229/Makefile +@@ -16,7 +16,7 @@ + + CPPFLAGS+= `pkg-config --cflags fontconfig x11 xft xinerama xrandr` + +-CFLAGS= -Wall -O2 -g ++CFLAGS?= -Wall -O2 -g + + LDFLAGS+= `pkg-config --libs fontconfig x11 xft xinerama xrandr` + -- cgit v1.2.3-65-gdbad