diff options
author | Andreas Schuerch <nativemad@gentoo.org> | 2013-04-27 18:49:52 +0000 |
---|---|---|
committer | Andreas Schuerch <nativemad@gentoo.org> | 2013-04-27 18:49:52 +0000 |
commit | 11a5c22da2dbc6ef8d61f51b072cb33ecf297f40 (patch) | |
tree | f53e260e2f3c4a2674d222da1f0183140cbccfd2 /www-apps | |
parent | Stable for x86, wrt bug #467450 (diff) | |
download | historical-11a5c22da2dbc6ef8d61f51b072cb33ecf297f40.tar.gz historical-11a5c22da2dbc6ef8d61f51b072cb33ecf297f40.tar.bz2 historical-11a5c22da2dbc6ef8d61f51b072cb33ecf297f40.zip |
maven config path corrected, see bug 466486. Thanks jeremiah for reporting!
Package-Manager: portage-2.1.11.55/cvs/Linux i686
Manifest-Sign-Key: 0xC1DE54B2
Diffstat (limited to 'www-apps')
-rw-r--r-- | www-apps/guacamole/ChangeLog | 8 | ||||
-rw-r--r-- | www-apps/guacamole/Manifest | 12 | ||||
-rw-r--r-- | www-apps/guacamole/guacamole-0.6.2.ebuild | 8 | ||||
-rw-r--r-- | www-apps/guacamole/guacamole-0.7.0.ebuild | 8 |
4 files changed, 20 insertions, 16 deletions
diff --git a/www-apps/guacamole/ChangeLog b/www-apps/guacamole/ChangeLog index 380ec3d2fe7d..ab5b496c36e1 100644 --- a/www-apps/guacamole/ChangeLog +++ b/www-apps/guacamole/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-apps/guacamole -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/guacamole/ChangeLog,v 1.3 2012/12/05 21:13:04 nativemad Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/www-apps/guacamole/ChangeLog,v 1.4 2013/04/27 18:49:45 nativemad Exp $ + + 27 Apr 2013; Andreas Schuerch <nativemad@gentoo.org> guacamole-0.6.2.ebuild, + guacamole-0.7.0.ebuild: + mvn-config-path corrected, see bug 466486 06 Dec 2012; Andreas Schuerch <nativemad@gentoo.org> guacamole-0.7.0.ebuild: removed some nasty stuff and added some elog about it diff --git a/www-apps/guacamole/Manifest b/www-apps/guacamole/Manifest index 2bace2654794..a9093fa0480c 100644 --- a/www-apps/guacamole/Manifest +++ b/www-apps/guacamole/Manifest @@ -3,14 +3,14 @@ Hash: SHA256 DIST guacamole-0.6.2.tar.gz 97138 SHA256 e0cf64202f6d2ac4e82ceed52536c1da2bb50f9fa1cfc8143bc88ca20029a204 SHA512 b37ff09d8bd376338a5ec8230390c345f396702ee48578f485cb02493f1401288a4f80a96accf38d8cc684420c7b1d610850a4d7547a085b489537e46e70be2f WHIRLPOOL ecfa13096d44998c6c4594af937a95f90c93a19626b91c971b3f0c130c275dd72c76b9b4ce460954413cc9aecdcb3856f03974d80acb176f3e2329bb5e91f23c DIST guacamole-0.7.0.tar.gz 99852 SHA256 01ee413933ae7e2117658f398cfe9fff0becea221b39d4f4759985c0dc4b3e08 SHA512 e28a192f076f92d6e42f8bad045cea2655adaab563a826cb5c9aa4bfa217c96fa59bc9f6fb92898d5e001fb27fbef3fcf78f25f7be6c2e5a187a69d2eda0c38a WHIRLPOOL 2f8b6b0b3ecb9dab6b4604549bb85303b7a64cfab4cdad962cc6f27a663dc7df1b0e58f5a7a58496aecaf88fa3cebb203243b630de982bcea214dc5da342759e -EBUILD guacamole-0.6.2.ebuild 1661 SHA256 a3145cba40d0c65f0b1a490fceb6cb9c0d53c755376a03fecbd097296c999da1 SHA512 d79cf10d55947cfc95fbd676efaaa0efc973fed90ba50a535d864384287f16ec64292983ae451a8dccc3a1db5a2991062b1b00f74b16c3d78e14475e4f1a570f WHIRLPOOL 4e19e329e989a8226a740c95fc6ab6c51b1f805a0e38f1b3e8e5417b2e2413b5fc86c8a44d2214d08cb6669a11eca73b28471bec44de9c57421a531ceb81b65d -EBUILD guacamole-0.7.0.ebuild 1838 SHA256 512f258c448d18a3720709b6b1751f986f20ea006cc6a6cdd632c9f417d271bc SHA512 bff2676d5f788b04994ff46730bef6219afae753a10db032033d3f345e57e2a3c7e3fbc97f8495a72b5e99f0f4628bbf81a48dcf5b56300f7b83af86ba73d597 WHIRLPOOL b538a7c5c6f6e6a5be63e54ff1d8cbe6c7f6a937cececae387f221cd97ea9bc6da43fa1c20666311bb091ff4a4c81878ee50983ddead26557b0e0f85706d77e2 -MISC ChangeLog 649 SHA256 016e682cf12dec3a78751ba245d5385349976a00e2058ea6d03cd0a3c2f2a06e SHA512 9c4c469ee24be6d27e4acb8cb0ed35adb8f5abe95e49113889e9bf3badc0046885f4fd81e17af5e49ec83e90c5a0b7273f5dde1f711d25cb86cf386a52496902 WHIRLPOOL 772524755811e90fe012fa6b44168b32f444ebed70a78470014a2edb0a8937600eaa1f75e3770226c264309f7e9aa395c1c983cea9c2938d3e4216caa45f617e +EBUILD guacamole-0.6.2.ebuild 1662 SHA256 d349fb2dbb96e12404449a9107a9e878c6590391b00c138e8a453ecc8d5b9072 SHA512 54dcabcf9b72eddbdacb0b9babdce917346bf4badd0d2ebec50ffefc4f45ec802e4461f656b3d34fa8c52e69c1c3ea91b9b616100706f06dab64afadcf8ad7ca WHIRLPOOL 9977a68fee22297338eed8b87cc3fb5ab2022df72b2d6d2e4a5208200aadc5fbd37d41a324b81a9de271a91aec3e5b809898b94fa96cbca6eab3e4b2731cdfda +EBUILD guacamole-0.7.0.ebuild 1839 SHA256 46ef79f4afdeb05886bdee8fede85940ac44c5d40cca7258f058ded022c5decf SHA512 f414c048c147865b01a85e883171488c4ba381c90c4a2b65a118424dada842c2b644570edf3ef3a8bc5fce9dcce43280565395cb94580dd7c46eb945a9010749 WHIRLPOOL ddfa63f17c94ab0e95e508506169f11182f0a0fcb4674498e9e1ac1096c1a8d7d751d3cfe51a41d6c18c1bbdae8b79f22e8f1ee7e46eb3871e527e7a51851eab +MISC ChangeLog 799 SHA256 44d5012bc91e37a7e05d67359550fcc41a751b395bcee8c9bfbd2a071f492be5 SHA512 a3d6c214d5977db6e99871a87891418099ca7dd9bccc2e68b8bc8c80a61edbee54ef4e1c9f2baf2abd1b97de5f83208897ea0898e1c4c2e174b06c782dc7fcd1 WHIRLPOOL 10f95682ff5c0352a1fdd713d7333281a13ffc267751051d84049c659fd942073c07d03121a08c009e795c2821d3d2e79353d6f1b9422964af8f245763a8549e MISC metadata.xml 641 SHA256 8da01a09b9826c5d47a704916466f320c7da31f5356db20874ebd7fc737bd51f SHA512 caef7a3e86f7e1cd1338e4abab0ee96c06690ab831f66260007a3ae732449fd4c87e98b97009b6a7f7be5f80746828b8bd0f49dde5c5a89717caedc6435b3773 WHIRLPOOL 45ddf48b13040a4f0fb36d7cd39fc030b0e087bb353b09d6d8c83ee8bb627cac82ee5d23181373675395394d8c4a3435855b4001d8a686557df701819a7f34bd -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEAREIAAYFAlDAJ6sACgkQakKUmsHeVLINuACcCcSZ0oRqdSUr9W/ZDEcXdjwy -a1cAnRkpC7BZUm1iLwlH4DtRsQRPfVj8 -=uZP4 +iEYEAREIAAYFAlF8Hb8ACgkQakKUmsHeVLIaRQCdHUebnhC/2s+q2znUgEYqBUjL +VgIAnRzAw0f35I+iJyt69abcLBa/7aMY +=cgjK -----END PGP SIGNATURE----- diff --git a/www-apps/guacamole/guacamole-0.6.2.ebuild b/www-apps/guacamole/guacamole-0.6.2.ebuild index f520db750ce4..d932e041e0a8 100644 --- a/www-apps/guacamole/guacamole-0.6.2.ebuild +++ b/www-apps/guacamole/guacamole-0.6.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/guacamole/guacamole-0.6.2.ebuild,v 1.2 2012/11/11 01:08:21 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/guacamole/guacamole-0.6.2.ebuild,v 1.3 2013/04/27 18:49:45 nativemad Exp $ EAPI=4 @@ -27,8 +27,8 @@ RDEPEND="${DEPEND} src_compile() { mkdir ${HOME}/.m2 - cat /usr/share/maven-bin-2.2/conf/settings.xml | sed -e 's:<!-- localRepo:localRepo:g' \ - -e 's:/path/to/local/repo:'${HOME}/.m2':g' >${S}/settings.xml + cat /usr/share/`readlink /usr/bin/mvn | sed 's:mvn:maven-bin:'`/conf/settings.xml | \ + sed -e 's:/path/to/local/repo:'${HOME}/.m2':g' >${S}/settings.xml mvn-2.2 -s ${S}/settings.xml compile war:war } diff --git a/www-apps/guacamole/guacamole-0.7.0.ebuild b/www-apps/guacamole/guacamole-0.7.0.ebuild index 20e9ad80a535..0796524132e8 100644 --- a/www-apps/guacamole/guacamole-0.7.0.ebuild +++ b/www-apps/guacamole/guacamole-0.7.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/guacamole/guacamole-0.7.0.ebuild,v 1.2 2012/12/05 21:13:04 nativemad Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/guacamole/guacamole-0.7.0.ebuild,v 1.3 2013/04/27 18:49:45 nativemad Exp $ EAPI=4 @@ -27,8 +27,8 @@ RDEPEND="${DEPEND} src_compile() { mkdir "${HOME}"/.m2 - cat /usr/share/maven-bin-2.2/conf/settings.xml | sed -e 's:<!-- localRepo:localRepo:g' \ - -e 's:/path/to/local/repo:'${HOME}/.m2':g' >"${S}"/settings.xml + cat /usr/share/`readlink /usr/bin/mvn | sed 's:mvn:maven-bin:'`/conf/settings.xml | \ + sed -e 's:/path/to/local/repo:'${HOME}/.m2':g' >"${S}"/settings.xml mvn -s "${S}"/settings.xml package } |