Don't install ini files for portage user

Package-Manager: portage-2.2.0_alpha28/cvs/Linux x86_64

4 files changed, 48 insertions, 4 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/Manifest b/media-gfx/povray/Manifest
index e219a4d0c8f2..f2b38b853edc 100644
--- a/media-gfx/povray/Manifest
+++ b/media-gfx/povray/Manifest
@@ -1,3 +1,7 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 3.7.0_rc3-user-conf.patch 1491 RMD160 db514d462e952abc3ace3c8574169cc6d68806d5 SHA1 fba21b345eaeb21e66b87c2209fae5c1d955d131 SHA256 95b04ec4973e6e8a80fc83df2e3caff0b4d6699c4154144f3017d42cab7236e0
 AUX povray-3.6.1-configure.patch 1081 RMD160 92dd3995691d567f6ae24b38bea1f31b9803b5b3 SHA1 c4c9fe03b8e24b8c03ed93abd484cfff3abd8dfc SHA256 a3278c6e43c30daa5a2edb7de3726e57f732f9c387b2d838cb41f3c7f14f773b
 AUX povray-3.6.1-find-egrep.patch 2463 RMD160 6af6c01daec1a0eb5ae27f65ede5411c4af2dbe2 SHA1 19537ff628130a4d2b048529e5a4f9bbfe79840c SHA256 1f56d1223954c1d0ed160b034badcf0878813b0bf984221c8eadce5d7666a46e
 AUX povray-3.6.1-libpng14.patch 776 RMD160 df044db215116ab40a3d957068eaf5a9aecce420 SHA1 619bed7be90e347fa3113299795a2b4efd4ee869 SHA256 30d508b14a68b3eff1b2dbaf180c5b9494629fb0720ae6e1ccb17b04efab93fb
@@ -8,6 +12,13 @@ DIST povray-3.7.0.RC3.tar.bz2 11226551 RMD160 b1ceeef850fa5876230a7fbfb8e1425480
 DIST povray-3.7.0.beta.40.tar.bz2 6537405 RMD160 fe7e0a45841da63e50cdc1af80d489c3eae40ccc SHA1 1dd67b290c6a2c2583eab5d1d253e93344bbf9aa SHA256 ddd8af6089312d0dae8b0c51891e1a89e1f8877ce9ddabac374b1b6abf85deb6
 EBUILD povray-3.6.1-r4.ebuild 2886 RMD160 5335a9c6490026b4450d6c70f57204d90afed3a5 SHA1 bdfffd031e8de3152d7a09c71437bfa92136616b SHA256 65b15122e7747a69999379c6f41f4a4aa02a0efc3fe89f971cfde13c73dc5a4c
 EBUILD povray-3.7.0_beta40.ebuild 4565 RMD160 da47c98a9df0281de7ffebfd8972aa13a1b81f37 SHA1 d9a921cdb5d737323bc595a272576c64c92370c7 SHA256 6adef09064fda79fcd367cfc6e4c042339bfb0bd4396fe772c6e5ccd62c8005d
-EBUILD povray-3.7.0_rc3.ebuild 3845 RMD160 61c0b112ef0dce59b73f8f6bd823ed689681887b SHA1 0422db4faa64a11fda5c08995e664a84c6397753 SHA256 05b49ec80afd31bdac9ef3678c3c3b04dec9f0078e355070757ddf84622a14d8
-MISC ChangeLog 16967 RMD160 3795758c0bd5fd87547bcbfb7e7061c71379d9db SHA1 0ae3c6f83cd9ca80a66f7d08d73a6c5e563abf4e SHA256 4e4003eea3794cd5810504b6a528ba4a6f6784cbcdb5029f0d725fb6890b73bb
+EBUILD povray-3.7.0_rc3.ebuild 3887 RMD160 d0d6c23ab1528129ba1c7d56dd19465cb576ea2c SHA1 3e9031b3b178f99d088ac8e14bb3704ee8915c4f SHA256 ed83606cd0d0ae60c9cbe3df5056b709b67ba7e6d8524c37daff26c2c0ac9bd6
+MISC ChangeLog 17116 RMD160 c8ed7c96ae306e4ea2d99e2f0b69a850d0a56d57 SHA1 4e995833bd751b47bf9a9149b67d49f7b2398b11 SHA256 959b13736de740f16ca32a73e44d6bcf817c34b2953cef74d5cd4627a0ff7908
 MISC metadata.xml 329 RMD160 9a8409749fb299cc185ff9a2ca652cfffe77ca2f SHA1 53bbc21317be841681161e836ea09f6340b75109 SHA256 8eafb1373ab7a91c0057026a1e12aa07acdb9830c2b1141140d381a5af4f62df
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2LadwACgkQgAnW8HDreRaxUACggcqJWabC8q0bW2GV7yXM9Uwz
+U2UAoKctzn4Za2NMKEAERYp3sJ8hKP1I
+=WtWd
+-----END PGP SIGNATURE-----
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
 }