diff options
| author |   Tim Harder <radhermit@gentoo.org> | 2012-06-17 07:00:40 +0000 |
|---|---|---|
| committer | Tim Harder <radhermit@gentoo.org> | 2012-06-17 07:00:40 +0000 |
| commit | ac8b933ef7d7d96be2864dd4506a55d7e4f0d152 (patch) | |
| tree | a5f7d8f0dd8f12e3ab2b2fe090908973d3f6a6b0 /x11-wm | |
| parent | Add ~x86-fbsd. #419621 (diff) | |
| download | gentoo-2-ac8b933ef7d7d96be2864dd4506a55d7e4f0d152.tar.gz gentoo-2-ac8b933ef7d7d96be2864dd4506a55d7e4f0d152.tar.bz2 gentoo-2-ac8b933ef7d7d96be2864dd4506a55d7e4f0d152.zip | |
Manually install files and drop parallel compile workaround since it was fixed upstream.
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)
Diffstat (limited to 'x11-wm')
| -rw-r--r-- | x11-wm/herbstluftwm/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-wm/herbstluftwm/files/herbstluftwm-9999-install.patch | 37 | ||||
| -rw-r--r-- | x11-wm/herbstluftwm/herbstluftwm-9999.ebuild | 18 |
3 files changed, 17 insertions, 45 deletions
diff --git a/x11-wm/herbstluftwm/ChangeLog b/x11-wm/herbstluftwm/ChangeLog index b5bbe0a83c04..23f6484dd345 100644 --- a/x11-wm/herbstluftwm/ChangeLog +++ b/x11-wm/herbstluftwm/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-wm/herbstluftwm # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/herbstluftwm/ChangeLog,v 1.3 2012/06/09 23:55:20 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/herbstluftwm/ChangeLog,v 1.4 2012/06/17 07:00:40 radhermit Exp $ + + 17 Jun 2012; Tim Harder <radhermit@gentoo.org> herbstluftwm-9999.ebuild, + -files/herbstluftwm-9999-install.patch: + Manually install files and drop parallel compile workaround since it was + fixed upstream. 09 Jun 2012; Tim Harder <radhermit@gentoo.org> herbstluftwm-0.3.ebuild, herbstluftwm-9999.ebuild: diff --git a/x11-wm/herbstluftwm/files/herbstluftwm-9999-install.patch b/x11-wm/herbstluftwm/files/herbstluftwm-9999-install.patch deleted file mode 100644 index 190bec275b9a..000000000000 --- a/x11-wm/herbstluftwm/files/herbstluftwm-9999-install.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- herbstluftwm/Makefile -+++ herbstluftwm/Makefile -@@ -56,34 +56,19 @@ - - install: all - @echo "==> creating dirs..." -- $(MKDIR) '$(DESTDIR)/$(LICENSEDIR)' - $(MKDIR) '$(DESTDIR)/$(BINDIR)' - $(MKDIR) '$(DESTDIR)/$(MANDIR)/man1' -- $(MKDIR) '$(DESTDIR)/$(DOCDIR)' -- $(MKDIR) '$(DESTDIR)/$(EXAMPLESDIR)' -- $(MKDIR) '$(DESTDIR)/$(BASHCOMPLETIONDIR)' - $(MKDIR) '$(DESTDIR)/$(CONFIGDIR)' -- $(MKDIR) '$(DESTDIR)/$(ZSHCOMPLETIONDIR)' - $(MKDIR) '$(DESTDIR)/$(XSESSIONSDIR)' - @echo "==> copying files..." - $(INSTALL) $(TARGET) '$(DESTDIR)/$(BINDIR)' - $(INSTALL) ipc-client/herbstclient '$(DESTDIR)/$(BINDIR)/' -- $(INSTALL) -m 644 LICENSE '$(DESTDIR)/$(LICENSEDIR)' - $(INSTALL) -m 644 doc/herbstclient.1 '$(DESTDIR)/$(MAN1DIR)/' - $(INSTALL) -m 644 doc/herbstluftwm.1 '$(DESTDIR)/$(MAN1DIR)/' -- $(INSTALL) -m 644 doc/herbstclient.html '$(DESTDIR)/$(DOCDIR)/' -- $(INSTALL) -m 644 doc/herbstluftwm.html '$(DESTDIR)/$(DOCDIR)/' -- $(INSTALL) -m 644 BUGS '$(DESTDIR)/$(DOCDIR)/' -- $(INSTALL) -m 644 NEWS '$(DESTDIR)/$(DOCDIR)/' -- $(INSTALL) -m 644 README '$(DESTDIR)/$(DOCDIR)/' - $(INSTALL) -m 755 share/autostart '$(DESTDIR)/$(CONFIGDIR)/' - $(INSTALL) -m 755 share/panel.sh '$(DESTDIR)/$(CONFIGDIR)/' - $(INSTALL) -m 755 share/restartpanels.sh '$(DESTDIR)/$(CONFIGDIR)/' -- $(INSTALL) -m 644 share/herbstclient-completion '$(DESTDIR)/$(BASHCOMPLETIONDIR)' -- $(INSTALL) -m 644 share/_herbstclient '$(DESTDIR)/$(ZSHCOMPLETIONDIR)/' - $(INSTALL) -m 644 share/herbstluftwm.desktop '$(DESTDIR)/$(XSESSIONSDIR)/' -- $(INSTALL) -m 644 scripts/README '$(DESTDIR)/$(EXAMPLESDIR)/' -- $(INSTALL) -m 755 scripts/*.sh '$(DESTDIR)/$(EXAMPLESDIR)/' - - www: - make -C www diff --git a/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild b/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild index a3236cc375c4..f4e979f4976d 100644 --- a/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild +++ b/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild,v 1.3 2012/06/09 23:55:20 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild,v 1.4 2012/06/17 07:00:40 radhermit Exp $ EAPI=4 @@ -27,19 +27,23 @@ DEPEND="${CDEPEND} app-text/asciidoc virtual/pkgconfig" -src_prepare() { - epatch "${FILESDIR}"/${P}-install.patch -} - src_compile() { - emake -j1 CC="$(tc-getCC)" LD="$(tc-getCC)" COLOR=0 VERBOSE= \ + emake CC="$(tc-getCC)" LD="$(tc-getCC)" COLOR=0 VERBOSE= \ $(use xinerama || echo XINERAMAFLAGS= XINERAMALIBS= ) } src_install() { - emake DESTDIR="${D}" PREFIX=/usr install + dobin herbstluftwm herbstclient dodoc BUGS NEWS README + doman doc/{herbstluftwm,herbstclient}.1 + + exeinto /etc/xdg/herbstluftwm + doexe share/{autostart,panel.sh,restartpanels.sh} + + insinto /usr/share/xsessions + doins share/herbstluftwm.desktop + newbashcomp share/herbstclient-completion herbstclient if use zsh-completion ; then |