summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schuerch <nativemad@gentoo.org>2013-04-28 08:25:59 +0000
committerAndreas Schuerch <nativemad@gentoo.org>2013-04-28 08:25:59 +0000
commit848a5f65c6e2b0340c07f84a7f5b69165e49d2f8 (patch)
tree5fb86cfa039dc95a05a91fc7c116b0d01daca44d /www-apps
parentUpdate wayland useflag usage a bit. Patch by Nikoli. (diff)
downloadgentoo-2-848a5f65c6e2b0340c07f84a7f5b69165e49d2f8.tar.gz
gentoo-2-848a5f65c6e2b0340c07f84a7f5b69165e49d2f8.tar.bz2
gentoo-2-848a5f65c6e2b0340c07f84a7f5b69165e49d2f8.zip
mvn-config corrected again... worked with FEATURES=userpriv
(Portage version: 2.1.11.55/cvs/Linux i686, signed Manifest commit with key C1DE54B2)
Diffstat (limited to 'www-apps')
-rw-r--r--www-apps/guacamole/ChangeLog6
-rw-r--r--www-apps/guacamole/guacamole-0.6.2.ebuild4
-rw-r--r--www-apps/guacamole/guacamole-0.7.0.ebuild4
3 files changed, 9 insertions, 5 deletions
diff --git a/www-apps/guacamole/ChangeLog b/www-apps/guacamole/ChangeLog
index ab5b496c36e1..463f44b54c9d 100644
--- a/www-apps/guacamole/ChangeLog
+++ b/www-apps/guacamole/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-apps/guacamole
# 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 $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/guacamole/ChangeLog,v 1.5 2013/04/28 08:25:59 nativemad Exp $
+
+ 28 Apr 2013; Andreas Schuerch <nativemad@gentoo.org> guacamole-0.6.2.ebuild,
+ guacamole-0.7.0.ebuild:
+ mvn-config corrected again... worked with FEATURES=userpriv
27 Apr 2013; Andreas Schuerch <nativemad@gentoo.org> guacamole-0.6.2.ebuild,
guacamole-0.7.0.ebuild:
diff --git a/www-apps/guacamole/guacamole-0.6.2.ebuild b/www-apps/guacamole/guacamole-0.6.2.ebuild
index d932e041e0a8..44b941c9e13c 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-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.3 2013/04/27 18:49:45 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/guacamole/guacamole-0.6.2.ebuild,v 1.4 2013/04/28 08:25:59 nativemad Exp $
EAPI=4
@@ -28,7 +28,7 @@ RDEPEND="${DEPEND}
src_compile() {
mkdir ${HOME}/.m2
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
+ sed -e 's:/path/to/local/repo:'${HOME}/.m2':g' -e 's:<!-- localRepo::' >${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 0796524132e8..b09536d39bd2 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-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.3 2013/04/27 18:49:45 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/guacamole/guacamole-0.7.0.ebuild,v 1.4 2013/04/28 08:25:59 nativemad Exp $
EAPI=4
@@ -28,7 +28,7 @@ RDEPEND="${DEPEND}
src_compile() {
mkdir "${HOME}"/.m2
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
+ sed -e 's:/path/to/local/repo:'${HOME}/.m2':g' -e 's:<!-- localRepo::' >"${S}"/settings.xml
mvn -s "${S}"/settings.xml package
}