Depending on virtual/mysql instead of dev-db/mysql, added epatch_user, fixed move of library directory; fixes bug #508800, reported by Brian Evans (grknight), proxied commit for SpiderX.

Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

3 files changed, 22 insertions, 19 deletions

diff --git a/net-misc/stargazer/ChangeLog b/net-misc/stargazer/ChangeLog
index f5323cddf023..79ac1bf026a1 100644
--- a/net-misc/stargazer/ChangeLog
+++ b/net-misc/stargazer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/stargazer
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stargazer/ChangeLog,v 1.5 2014/01/08 06:37:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stargazer/ChangeLog,v 1.6 2014/04/26 22:24:21 tomwij Exp $
+
+  26 Apr 2014; Tom Wijsman <TomWij@gentoo.org> stargazer-2.408.ebuild:
+  Depending on virtual/mysql instead of dev-db/mysql, added epatch_user, fixed
+  move of library directory; fixes bug #508800, reported by Brian Evans
+  (grknight), proxied commit for SpiderX.
 
   08 Jan 2014; Mike Frysinger <vapier@gentoo.org> stargazer-2.408.ebuild:
   Inherit the user eclass for enewuser/etc...
diff --git a/net-misc/stargazer/Manifest b/net-misc/stargazer/Manifest
index 52c4dceae98e..d691cbbc625a 100644
--- a/net-misc/stargazer/Manifest
+++ b/net-misc/stargazer/Manifest
@@ -25,23 +25,17 @@ AUX patches/stg-2.408-static-libs.patch 194 SHA256 6e1cd7b76a266335bd49b00decd72
 AUX rscriptd 452 SHA256 5edddec4558285b970a202548c8188c26dde1415044bf0ca634042e8dc550092 SHA512 b271a1d554fd70064742d2517c247556245ba0d2ac75fee055998a727c24edba91983758b69794d54fa3e5577131cc5f143a852591665c7279de628b3716156c WHIRLPOOL 79ae200f8208af4bb76b1a62bf118ba5a5a0144f4c4ad4e9e7d5deaaa4c8da01b0f776e20a6f6b277fcdb0d9af25c72630191f562195444c6274540d48914198
 AUX sgauth 461 SHA256 03e886b76e434928d32dcfba86c09ab7dcd47334f33c0e68af357578ba714361 SHA512 61a098ca5c376830bbd19a29094880a5b01aa707bdb49edcb0c5d19c33d0735c3a5971fd1329c62b70838b316c2eae539bdaa56ebe470acd0562a735946a810f WHIRLPOOL ff29b1d3842a5bbebfeca3fe6b2de2fff92c9976991feb17337182c1ef8a0eea8295ac8f5a08866d7a7428e07bfef42b3df907e3b69a3104fb075f78786e5b75
 DIST stg-2.408.tar.gz 5100291 SHA256 f2de88cba1a07b10dba266df262ba719cdeb8efc169ce52711519d81b3c36fc1 SHA512 200e08cfd629dbacda31ffd3134c2908a1ad58604421cc288ad0ec1bdcd60fe021d51fed50fdc2517bb7c2b61ef23b0b9c71a606babd09bc7804cb899e0b7f75 WHIRLPOOL 3701d0bf16e06dc61474a772566a570a21d04fcf5ac5c28fb61b454f21c1471adc6f45645c3929b3ed15bb33eee10425a942b25f83ea7b3ea94eb15b80df7dad
-EBUILD stargazer-2.408.ebuild 20037 SHA256 85d26f57d4be9cde498b3113ababa79df1c828e6ed814a899a9d90cf3676f05e SHA512 a3d480ce9232b44e9e74d3d1ba6dfa3d4e5e5b50df65cdedcba5217379b8efb1676982400ca9de5f6648580a957553c2b82c454b058f2cb84205a2423dee2c45 WHIRLPOOL 453644add15a2fb7fc2c26c85694cc49ad037a43a53cbeccc08077329b3b251bbea0c3f03f2e20d235d8ba2eaae1af57b31f72c1f48439ff68514650a38808cc
-MISC ChangeLog 1988 SHA256 92ee9c49d609dae61eab8171ba6fd13bad84a976afd70c1e4791fcfd98dae18b SHA512 e25cc94c9d2230f7697597052cbc187cbb328ba1e7b2575b0559521f82db10632e2677b26adb83dcfec0fe9e7c7b003bee1a9fd18757f9da919f839fea2193e8 WHIRLPOOL c501c12eebbcb3b2286933eef0ede3d8ac2a05931cf684d6634980c1a2881053dd3f0285602abc6c2610c5430fd3f1af8579c4ea80a0dd57ae864d57154d5d7a
+EBUILD stargazer-2.408.ebuild 20104 SHA256 d34e6e508424d15b4642fb005c9db458c49483c78f458620ef6d9bce5c24f4bf SHA512 02ea8fcc97e94a1bddc75d389c21b7be5cfdc35d69b2fcf2930bc158f4116a7b6c2815c57780d44bf7130f097d93ac91ddfd99e1ebb3e92768e9cc7aac329ea9 WHIRLPOOL b4f478aa1bcd0e5361086bc5bacc33746baf7f0dc87a7a628613104476eea872335ff56c59deb1d7d04189962cb1b85f830aa48923259f7e93da010e3485b2d1
+MISC ChangeLog 2253 SHA256 1552cd0cd204a61e6f959873e64b9f7b913e7f5ef1ac593ebae526e1ed8715c4 SHA512 868ecbdac8a3af812c6f8c09f6fc43231c5c09d033beb7ba071662c301d1e85eede8394a903f4be1ba79c4c62995082408430868b818b573784e4d36d9cf58c0 WHIRLPOOL 78519d82016b3c32f486d09af65dabb4b58b82781b0f5a376e2e59afca248c9bf4fbcaea641e60fd9f4caaec1a3274715f64dc57f22e08112c461bcb96c74dc2
 MISC metadata.xml 4392 SHA256 7e7f16f0377e3a7f8dbbed4a761b453bccb8081240f5a92bb84e2127390bdf68 SHA512 3b32678a02ee0b2e16610ad89a5032630527e8ede857889ac0e7f2add5a79334e7a957f1da025c170932b1fc77505db435b4030ca9e94dbae19415899a365e84 WHIRLPOOL 4971a46ae5fbbdfbad454d81d6ac545f427281277f0a80d471d2fb27fbcd708b9a6636ec38d9d59feaf98c033f9e37ae6dfd8f5b574a28fde584ad9f0a3cc886
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSzPIiAAoJEPGu1DbS6WIApWAQAIpT/Zj2MENcaDzlxvi7pHO7
-pDiYr5eHujQ4j1gMdrE7ecn+aAU8FBpojOCboI2h0f6vo68xL5OgdqsNrhYo82Z3
-oLyjqeVLH33l/2yY+Z4g5bOkAp8f4POOvCvnWRcEUamgqmPHnE2fqg9cLQy1c+ut
-CCdGILiCicq9x3FTZ7HMZGNlFN0vSS3IxzPIX/GbPTMzSNVYBl1UCqONtAdxPleX
-ubEwsLMPvw0EHb7PiRykwz3+6211/MJXlwqucU6LP53fOopmxCducZMV4GaK3Mob
-UkV6QIfcnLHD76iwL4+nAj5eSwVlI0QOVMYmLBHnSe/p/CbnEsOvIR2qGIvn2NYp
-L88svQ49c3MOC+PjcJHizYq35+rT6iZHoCWJCtlq5SGfzm+H0yo9sHVs/lFkglGD
-n+BTXz4gKwq12SCEzAJwtzdqaS0VpWLDURfOynL4uUXbMDwddVwhDJ0aYfEnHWXR
-+/yy64GIqUnMm1PlaJfpehG5bWjSyQ6BNZV4p6TG+Vc0mbl9vKxLFS0p0AcXlxBb
-KGc+dZW4GfQVjv/CNIlf771uvnY0fj3hn9ot0jvRKvpnahHAxSE95jwYt93XZRZX
-9q9CFnSVCwwCxlYVoEoXBM8i4YgesOXO4SLNfZGTfVZa6J69bkNY1smS6SlMQJA0
-LctbYw7U12g0+F8zX3s7
-=+sMm
+iQEcBAEBCAAGBQJTXDHTAAoJEJWyH81tNOV9IpMH/26tH/fi8s/aLUEgJ91Nozgb
+Qmzi0EVnE9pfmcqkEEa6gvs+z67mXMKLw1JFQrmVbzomrr5+JCYocOa/8eJzde+g
+rRhaIZ6eUkOtt6kk60T8TNk+cehO30TDbFyiFVw/XMPCZuiCphg3a59AkcATC6X4
+z9A3Nh2cXRwi93ZKULvSO7kiqmR1E91Oq7qz9bEfhQeNLyP58HyflyvXOl2pkOFc
+onOTzfX2oQoREww6BA+iS9RAXJwKCV3qh7IxbDGG1/gwMFfitQkxLDRQ9r1mbX3y
+Dd1fRWM6wqkhZUi7PuyXyeyXITM9GmUYgS0QgOTk1upxcrmK3mU1pqMq76AZiz4=
+=iH08
 -----END PGP SIGNATURE-----
diff --git a/net-misc/stargazer/stargazer-2.408.ebuild b/net-misc/stargazer/stargazer-2.408.ebuild
index acfc5472ed95..cf7919e93792 100644
--- a/net-misc/stargazer/stargazer-2.408.ebuild
+++ b/net-misc/stargazer/stargazer-2.408.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stargazer/stargazer-2.408.ebuild,v 1.3 2014/01/08 06:37:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stargazer/stargazer-2.408.ebuild,v 1.4 2014/04/26 22:24:21 tomwij Exp $
 
 EAPI="5"
 
@@ -22,7 +22,7 @@ REQUIRED_USE="stargazer? ( ^^ ( module_store_files module_store_firebird module_
 RDEPEND="module_config_rpcconfig? ( dev-libs/xmlrpc-c[abyss] sys-libs/zlib )
 	module_config_sgconfig? ( dev-libs/expat )
 	module_store_firebird? ( >=dev-db/firebird-2.0.3.12981.0-r6 )
-	module_store_mysql? ( dev-db/mysql )
+	module_store_mysql? ( virtual/mysql )
 	module_store_postgres? ( dev-db/postgresql-base dev-libs/openssl sys-libs/zlib )
 	sgconf? ( dev-libs/expat )
 	sgconf_xml? ( dev-libs/expat )"
@@ -153,6 +153,8 @@ src_prepare() {
 
 	# Check for IPQ subsystem availability
 	( use module_capture_ipq && kernel_is ge 3 5 ) && die "IPQ subsystem is gone since Linux kernel 3.5. You can't compile module_capture_ipq with your current kernel."
+
+	epatch_user
 }
 
 src_configure() {
@@ -376,7 +378,9 @@ src_install() {
 	( use sgconv || use rscriptd || use sgauth || use stargazer ) && fowners -R stg:stg /etc/stargazer
 
 	# Put the files in the right folder to support multilib
-	mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir) || die "Failed to move library directory for multilib support"
+	if [ ! -e "${ED}"/usr/$(get_libdir) ] ; then
+		mv "${ED}"/usr/lib/ "${ED}"/usr/$(get_libdir) || die "Failed to move library directory for multilib support"
+	fi
 }
 
 pkg_setup() {