Fix by Marcel Pennewiß for sed error when USE=-java #299888.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

5 files changed, 20 insertions, 15 deletions

diff --git a/net-misc/ssvnc/ChangeLog b/net-misc/ssvnc/ChangeLog
index b8c9c1d029d9..37fe689df804 100644
--- a/net-misc/ssvnc/ChangeLog
+++ b/net-misc/ssvnc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/ssvnc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ssvnc/ChangeLog,v 1.8 2010/01/05 16:26:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ssvnc/ChangeLog,v 1.9 2010/01/07 00:07:07 vapier Exp $
+
+  07 Jan 2010; Mike Frysinger <vapier@gentoo.org> ssvnc-1.0.22.ebuild,
+  ssvnc-1.0.24.ebuild, ssvnc-1.0.25.ebuild:
+  Fix by Marcel Pennewiß for sed error when USE=-java #299888.
 
 *ssvnc-1.0.25 (05 Jan 2010)
 
diff --git a/net-misc/ssvnc/Manifest b/net-misc/ssvnc/Manifest
index a84d40e7368b..0dc2a00e0f26 100644
--- a/net-misc/ssvnc/Manifest
+++ b/net-misc/ssvnc/Manifest
@@ -11,15 +11,16 @@ AUX ssvnc-1.0.25-build.patch 3570 RMD160 0cd6f2eb88508cb2c014b06594e93229e9b3652
 DIST ssvnc-1.0.22.src.tar.gz 453665 RMD160 4e367d9662add8630029772edd392dd34de23e6a SHA1 4cf77c3110ac730abd59f2c2b8461c8f9eb1c1fa SHA256 a758ad5f4584f2b7aa170fbae5a99849bbc97ef0500b1ecb7445dcbd01d736d9
 DIST ssvnc-1.0.24.src.tar.gz 498389 RMD160 792edead091391244a744cbb27f72a4d9c6952d1 SHA1 97a807eedef4556e51df9b9a4a116d98deb414c5 SHA256 25b66f7e9a7738628f014e3f0a136a561306d019470bf8cee094a62382239eba
 DIST ssvnc-1.0.25.src.tar.gz 518220 RMD160 f1f6ff519ea9463c07f1da50743190dd294f69cd SHA1 55ca306016fddb0becb081eb755b9e3e35f2e8cb SHA256 81e709a168688764ac00003d40546d98268e014799fc8c74260e841cf72ebbc1
-EBUILD ssvnc-1.0.22.ebuild 1292 RMD160 e3f1b4d4036d16db68988f3318fb03374adfcbb2 SHA1 605eef51df2267d597a283d800ab9f5c7f81fa0f SHA256 54f5bf9cb18eb99583856807ccfafeb5e826eeba025c9af9bcd73e88d309e40a
-EBUILD ssvnc-1.0.24.ebuild 1467 RMD160 baf3c36dc6a5c22469278251d67d2140f6fab689 SHA1 5b9865b79c7e1050d458629885af3b514ffcba6c SHA256 4b69b61724eb2f8916b618b625637a6cf18ccf2fa435d4a8d27512d0829f5eec
-EBUILD ssvnc-1.0.25.ebuild 1487 RMD160 eb07674b94dd81b8ab7c1effa1a0c996881628e4 SHA1 9fb366e5d8ddf2d0caf49c86f97196175788b296 SHA256 017cc1dfc55ab77cf82a6186872173f93fc051032cd2bed0039ffe34bae2776e
-MISC ChangeLog 1328 RMD160 6817ab45340c3921484e37b35738458747dad604 SHA1 835fdc2fab85e3ae9858cbb0571b78ad75446d36 SHA256 e187e8ae3a66ad24fa3b447913cc59291dca536c027cce0a41436f489b56c1cb
+EBUILD ssvnc-1.0.22.ebuild 1294 RMD160 a931e8ad5cb4a9494e8a8ab09f4b9af8bbd9abf0 SHA1 15dfcee5a2db398f5f7d6ca2f9d56168da001015 SHA256 fa87da97e744607086edf1c2d5702cbab88a8ee581e60f24d31da72ca016b571
+EBUILD ssvnc-1.0.24.ebuild 1469 RMD160 b3fefc55d6c6e0434cbeb2823131e916566f5e7b SHA1 0f284dc259640a7b8c563e91ed9ac7dc5d0e4aff SHA256 1d756e476128d6f2b0a4d7803bfdf08db1018c96eda44210e360857f0370e937
+EBUILD ssvnc-1.0.25.ebuild 1489 RMD160 f3514fa760c802fe6da7ceaa0fb096546a0bf0ae SHA1 171467aba88c12001bf2cbd2cdc7dc2964edc78d SHA256 a6c07350d482239bec97681e05eda3fec6a356a9982362418ebfbc2a7953285c
+MISC ChangeLog 1508 RMD160 7fb1897437bac43cbc5d66df9e6944eceb127944 SHA1 7dc3e8028a65c331be0b7c8501ee8223cf14a563 SHA256 26392605bb832ae5baeb34befe7d97f3e92d69bafa3f5faea179cc57720d6b99
 MISC metadata.xml 221 RMD160 2699c0059639536eb7befa077a27e437569a26ba SHA1 4bef3741184af2e2d984fec094cd0ab39ae2e624 SHA256 1d72b91d3ef79fdff0049c23a645d8595a5fb72ea7e5d5b6fa43cfc18e9a4627
+MISC ssvnc-1.0.5.ebuild.rej 333 RMD160 8a8f401c7c8f983f5f54ae7d9f45bf9648809ddd SHA1 8792ee147cec45ba40ba821df367d10888087c03 SHA256 b78bdd1bad7015607055405b31d876fc56d8aba51faaa956df8d96e61e03fa6a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iF4EAREIAAYFAktDahwACgkQTwhj9JtAlp6+/QEAv601cewmVDiCnPR2ah6hPOAt
-KhiLRTGe/vMZxiEkrU8A/2Fp/4euGueyw0UcMFJHvXukOf/Y4ckAncQnZ1pCIhDV
-=Txcg
+iF4EAREIAAYFAktFJicACgkQTwhj9JtAlp4cIgD8Dp56P1j9rKhNt3P1wiiyxCR5
+QyP+mZqO1BHz2YKl3WEA/0ZoxWuYNdHvBptvAt6B1p9VNx9vwc0RhmLIfzgmh4Qy
+=axMx
 -----END PGP SIGNATURE-----
diff --git a/net-misc/ssvnc/ssvnc-1.0.22.ebuild b/net-misc/ssvnc/ssvnc-1.0.22.ebuild
index c00f6157be9d..f1f7a542cf05 100644
--- a/net-misc/ssvnc/ssvnc-1.0.22.ebuild
+++ b/net-misc/ssvnc/ssvnc-1.0.22.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ssvnc/ssvnc-1.0.22.ebuild,v 1.3 2009/06/29 20:55:26 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ssvnc/ssvnc-1.0.22.ebuild,v 1.4 2010/01/07 00:07:07 vapier Exp $
 
 inherit eutils multilib
 
@@ -42,7 +42,7 @@ src_unpack() {
 		vnc_unixsrc/vncviewer/Makefile
 	sed -i \
 		-e "/^LIB/s:lib/:$(get_libdir)/:" \
-		-e $(use java || echo '/^JSRC/s:=.*:=:') \
+		-e "$(use java || echo '/^JSRC/s:=.*:=:')" \
 		Makefile
 }
 
diff --git a/net-misc/ssvnc/ssvnc-1.0.24.ebuild b/net-misc/ssvnc/ssvnc-1.0.24.ebuild
index 58d10fe1b676..78863d26fc77 100644
--- a/net-misc/ssvnc/ssvnc-1.0.24.ebuild
+++ b/net-misc/ssvnc/ssvnc-1.0.24.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ssvnc/ssvnc-1.0.24.ebuild,v 1.2 2010/01/05 16:24:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ssvnc/ssvnc-1.0.24.ebuild,v 1.3 2010/01/07 00:07:07 vapier Exp $
 
 EAPI="2"
 inherit eutils multilib toolchain-funcs
@@ -37,7 +37,7 @@ src_prepare() {
 
 	sed -i \
 		-e "/^LIB/s:lib/:$(get_libdir)/:" \
-		-e $(use java || echo '/^JSRC/s:=.*:=:') \
+		-e "$(use java || echo '/^JSRC/s:=.*:=:')" \
 		Makefile
 	sed -i \
 		-e '/^CC/s:=.*:+= $(CFLAGS) $(CPPFLAGS) $(LDFLAGS):' \
diff --git a/net-misc/ssvnc/ssvnc-1.0.25.ebuild b/net-misc/ssvnc/ssvnc-1.0.25.ebuild
index 40a35aaadca3..6ffdb95495ba 100644
--- a/net-misc/ssvnc/ssvnc-1.0.25.ebuild
+++ b/net-misc/ssvnc/ssvnc-1.0.25.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ssvnc/ssvnc-1.0.25.ebuild,v 1.1 2010/01/05 16:26:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ssvnc/ssvnc-1.0.25.ebuild,v 1.2 2010/01/07 00:07:07 vapier Exp $
 
 EAPI="2"
 inherit eutils multilib toolchain-funcs
@@ -38,7 +38,7 @@ src_prepare() {
 
 	sed -i \
 		-e "/^LIB/s:lib/:$(get_libdir)/:" \
-		-e $(use java || echo '/^JSRC/s:=.*:=:') \
+		-e "$(use java || echo '/^JSRC/s:=.*:=:')" \
 		Makefile
 	sed -i \
 		-e '/^CC/s:=.*:+= $(CFLAGS) $(CPPFLAGS) $(LDFLAGS):' \