diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2011-03-24 15:57:10 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2011-03-24 15:57:10 +0000 |
| commit | 20dcc929cc7ae494ef1c0faa50ce4c5f2c387c5c (patch) | |
| tree | 80803a399dfb1aabbbaa6f2ae8a93c3c370a29e9 | |
| parent | Removed sys-apps/inotail mask (diff) | |
| download | gentoo-2-20dcc929cc7ae494ef1c0faa50ce4c5f2c387c5c.tar.gz gentoo-2-20dcc929cc7ae494ef1c0faa50ce4c5f2c387c5c.tar.bz2 gentoo-2-20dcc929cc7ae494ef1c0faa50ce4c5f2c387c5c.zip | |
Don't install ini files for portage user
(Portage version: 2.2.0_alpha28/cvs/Linux x86_64)
| -rw-r--r-- | media-gfx/povray/ChangeLog | 6 | ||||
| -rw-r--r-- | media-gfx/povray/files/3.7.0_rc3-user-conf.patch | 27 | ||||
| -rw-r--r-- | media-gfx/povray/povray-3.7.0_rc3.ebuild | 4 |
3 files changed, 35 insertions, 2 deletions
diff --git a/media-gfx/povray/ChangeLog b/media-gfx/povray/ChangeLog index 0ed69cbe59c2..0d3f3fdc4e0e 100644 --- a/media-gfx/povray/ChangeLog +++ b/media-gfx/povray/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/povray # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.111 2011/02/26 18:23:12 signals Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.112 2011/03/24 15:57:10 jlec Exp $ + + 24 Mar 2011; Justin Lecher <jlec@gentoo.org> + +files/3.7.0_rc3-user-conf.patch, povray-3.7.0_rc3.ebuild: + Don't install ini files for portage user 26 Feb 2011; Kevin McCarthy <signals@gentoo.org> povray-3.6.1-r4.ebuild, povray-3.7.0_beta40.ebuild, povray-3.7.0_rc3.ebuild: diff --git a/media-gfx/povray/files/3.7.0_rc3-user-conf.patch b/media-gfx/povray/files/3.7.0_rc3-user-conf.patch new file mode 100644 index 000000000000..f20d9b5069bb --- /dev/null +++ b/media-gfx/povray/files/3.7.0_rc3-user-conf.patch @@ -0,0 +1,27 @@ + Makefile.am | 13 ------------- + 1 files changed, 0 insertions(+), 13 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 76b394c..9822c52 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -107,19 +107,6 @@ install-data-local: + for f in $$filelist ; do \ + $(INSTALL_DATA) $(top_srcdir)/doc/$$f $(DESTDIR)$(povdocdir)/$$f && echo "$(DESTDIR)$(povdocdir)/$$f" >> $(povinstall); \ + done +- @echo "Creating user directories..."; \ +- for p in $(povuser) $(povconfuser) ; do \ +- $(mkdir_p) $$p && chown $(povowner) $$p && chgrp $(povgroup) $$p && printf "%s\n" "$$p" "`cat $(povinstall)`" > $(povinstall); \ +- done +- @echo "Copying user configuration and INI files..."; \ +- for f in povray.conf povray.ini ; do \ +- if test -f $(povconfuser)/$$f; then \ +- echo "Creating backup of $(povconfuser)/$$f"; \ +- mv -f $(povconfuser)/$$f $(povconfuser)/$$f.bak; \ +- fi; \ +- done; \ +- $(INSTALL_DATA) $(top_srcdir)/povray.conf $(povconfuser)/povray.conf && chown $(povowner) $(povconfuser)/povray.conf && chgrp $(povgroup) $(povconfuser)/povray.conf && echo "$(povconfuser)/povray.conf" >> $(povinstall); \ +- $(INSTALL_DATA) $(top_builddir)/povray.ini $(povconfuser)/povray.ini && chown $(povowner) $(povconfuser)/povray.ini && chgrp $(povgroup) $(povconfuser)/povray.ini && echo "$(povconfuser)/povray.ini" >> $(povinstall) + + # Remove data, config, and empty folders for 'make uninstall'. + # Use 'hook' instead of 'local' so as to properly remove *empty* folders (e.g. scripts). diff --git a/media-gfx/povray/povray-3.7.0_rc3.ebuild b/media-gfx/povray/povray-3.7.0_rc3.ebuild index f0cc66d662c5..d025d5fb0761 100644 --- a/media-gfx/povray/povray-3.7.0_rc3.ebuild +++ b/media-gfx/povray/povray-3.7.0_rc3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/povray-3.7.0_rc3.ebuild,v 1.2 2011/02/26 18:23:12 signals Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/povray-3.7.0_rc3.ebuild,v 1.3 2011/03/24 15:57:10 jlec Exp $ EAPI="3" @@ -59,6 +59,8 @@ src_prepare() { # prompts the user to interact, so remove it. sed -i -e "s:biscuit.pov -f +d +p:biscuit.pov -f +d:" Makefile.am || die + epatch "${FILESDIR}"/${PV}-user-conf.patch + eautoreconf } |