Version bump, drop old

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x60C0742D1F357D42

4 files changed, 41 insertions, 70 deletions

diff --git a/net-p2p/retroshare/ChangeLog b/net-p2p/retroshare/ChangeLog
index 485b874ff092..cc4486efd2ca 100644
--- a/net-p2p/retroshare/ChangeLog
+++ b/net-p2p/retroshare/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-p2p/retroshare
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/retroshare/ChangeLog,v 1.12 2015/06/15 00:14:17 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/retroshare/ChangeLog,v 1.13 2015/06/28 17:24:32 pinkbyte Exp $
+
+*retroshare-0.6.0_rc2_pre8551 (28 Jun 2015)
+
+  28 Jun 2015; Sergey Popov <pinkbyte@gentoo.org>
+  -retroshare-0.6.0_pre20150415.ebuild, +retroshare-0.6.0_rc2_pre8551.ebuild,
+  -files/retroshare-0.6.0-force-sqlcipher.patch:
+  Version bump, drop old
 
 *retroshare-0.6.0_rc1 (15 Jun 2015)
 
diff --git a/net-p2p/retroshare/Manifest b/net-p2p/retroshare/Manifest
index f2c7c308e803..bb483dd3d7c1 100644
--- a/net-p2p/retroshare/Manifest
+++ b/net-p2p/retroshare/Manifest
@@ -1,23 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX retroshare-0.6.0-force-sqlcipher.patch 1874 SHA256 09a169022b3966e05ba701e2030dff3f64920398a318b7ed9bcf79742b43e65b SHA512 11e1784f4749d284d7c6ebc211bfdb2415964e24504a9c853e7cb81a9db7a56117c66734c573a04fc5df037e8399f51f37a3b020808d5fc63cda9a2ac4af8afb WHIRLPOOL ff845a6f7441d37e4e14453b9290c40a18ccc95b3447fbce6e0e4f59d0181a7079cd1f2db1aa56ba7d078f51c0f5a1753fb6872afcb381d2e335feda02d76833
 DIST RetroShare-0.6.0-rc1.tar.gz 14023555 SHA256 987d74877b654eec945e0f8d400c49dd62279ed25f9eb6e7fd8c123f2289d0cf SHA512 79046349b9bf58b77e4ce42069a7ec201f3e5eab862ea2b56291318da887297ff960b1153f6ed87d3416052d9ce58e432ada11f91c0648066c300847a5b85aea WHIRLPOOL 9d73cced5530f0d4c7ae051f829b0d5954f8132ad15dc8545685cde5a4ece34c9b24b29fcd99056b92ba2e5299e08b6d765116b08e8473707881c3a7dba3065e
-DIST retroshare-0.6.0_pre20150415.tar.bz2 10838852 SHA256 c63301c000b0ead612220e05c05f900c23cb2fa5e56ae6f9359888b63e0a347d SHA512 d435994b79c1518b531ead54d149ed4ca015c936748d0498fc7b95993e197c4d9afb71f926cc618044682dcb947203f70903dd0cc0116263b7c85f3495d52f6f WHIRLPOOL 7844c8dd4dcbf3c716b21d2086a7028edec01fc2ccb6a83924e2123319951d53584f7a38479e16c99e60b025061d9c5057ed8615e105ae50d7cd5c51f28b3c33
 DIST retroshare_0.5.5-0.7068.tar.gz 11899395 SHA256 772b0d7916137e81fc0f5ea14f0a8fa70d3d7acb701ca0b0c1c66018f2255650 SHA512 51caeca54c6b6ce6ec049d3004301a74db5bb5dc2390c769486429ca0db4e45e2d8eba98c3f9ea99628c1a2452d71c8460ea4d3b3c103e321d3459211767bc1d WHIRLPOOL f6c8a7323be84d79975e970629f5bd457487cac6a061bc6817da328ff1de03a8d3fab98ab3cf4fba0628f239e09d8f8da4c14587764689a23193bbda22419e88
+DIST retroshare_0.6.0.RC2~8551_src.tgz 14773671 SHA256 2320676da905de6c48b01eda611811965277ffa1d5ddbb387aa8f0414c2de050 SHA512 6cfd714f6e72d43559909a72d448b90068414be26da73928ff7bfaaf5be5f7c47f5e7932f1ff2ab4d8a7c277ea4407ab3bd539a1ad4a2a7810dc79b32b1348b1 WHIRLPOOL b1a030d9fc797fa6a13c2166323cc7bcbb79c70e46ead2e06414650ab763aaacf61fbe24fc634707be42c9b6611a265ac7d675e02b950fe1d8d42364bf0dc089
 EBUILD retroshare-0.5.5c.ebuild 3036 SHA256 6635b4ca375be58e2e87554193b59e8d1d15b553daed2322228385135e362e0d SHA512 a7673e48fb6edaa751f407af4b3f5dbaea24fca58fb7eca332ba9a46ac6d4f7834dec613020f4403a455e6187039ddb8528d881e94eeee54c82c4ec11f3d3df8 WHIRLPOOL 1270352ae402b7181c8671e05251da5b6589606e0f06c27deeb74de0404a0dc83495f8ce8e50dc8ade43235278d0aa36b0411816a0d422d2105bebde8f8bb3bd
-EBUILD retroshare-0.6.0_pre20150415.ebuild 3228 SHA256 99fe99c4cbc8c47d7a9fe3a8cc15b5b7080cc74630e9827ae64764177c87ab84 SHA512 3e30744b4f8550ccd9e7135f0b321a9684e6ee40c13648c47460c6edfb18aa94c7f7b9ba87ceb9853b7cb817b42e71973852e0b752d18c803413c032b3c19a1e WHIRLPOOL 0d21aeaf95328d0b2344ae9f07138c3e603cda26fc4b4a65d8bd22500c36ba47c92c82a807bb6ec1c7e1e7d5bce2987a7692ae85baf2235d91c93e47f0bbf2b8
 EBUILD retroshare-0.6.0_rc1.ebuild 3662 SHA256 4b9081b45d5703fee6986c37179ff9f444355e1bd43eca2b7c96b34dd23012a7 SHA512 c58f136e0b3a46984eca071fdee17e6fdf43cb90601e6a31f2d1d985a5e2bdd0ff1ff97293917a1eeaca3ee8ae953a372b36e3d9e9ba18fadf9cc18ead7d0db1 WHIRLPOOL 16bb81c9d361818cce3c537c3f8d356029b294745028569ee9a14fbddce895a78fe8ac842e3142ef8b1c3644383efeaccc177e214749a50ef32b205ae051c88a
-MISC ChangeLog 1863 SHA256 2cba8280997a127ea27d1d17eff9213fe6ce3fcfbdbf9b855f11baab574648f6 SHA512 98c3926337bae52392572a6120a456600a3c327a4e9f7f602c621aedca1c12fbaa9271213e8308d401200d2418d3d359a9d5b9d907159c4488ffb318959a8e00 WHIRLPOOL 77d0c5b3f63ea4412fa9d612d6ab1e9ab7df26a237fc57bd5148df9c90b546cc066ac7bab0083986a6a4e2873d358a12fa4e16c01df4f060596eb6586b2e1a50
+EBUILD retroshare-0.6.0_rc2_pre8551.ebuild 3678 SHA256 c24cf1be69f373a37f1f5a657dc525603085d901a84ba9805b54ae77127705a8 SHA512 29528661ae478109306411ed980e0909fdc1ce4a8a856cad2ae324fd808255f0d55a454694bb5f12104748e57ad0ea887ca6ee31e460873a4cb77cdfd118cd6c WHIRLPOOL 6e42f20a9c14b792ceecc4e25cbd837a06e9e7aea9cab1c4f6617172b5765cf0c0be3ed41464c64da8c938b44c4df36c023331e4a0d614066e5b3442acebd210
+MISC ChangeLog 2111 SHA256 9dd493206ef786ed5512126c1400372e37d4b6c37ba922205d48aa1e1658f5ef SHA512 9d85e7ceec1d62edde2bcb34193385f3bd276b300b7646a07dfe9b4b04d94b07364bb4bd8fc2f006cc302325022dd029cf64f49cd8d77384465100f6d62d5ae3 WHIRLPOOL 5770d827830097e98793b753057aa28c7a0b0a434316ef924207b5689bad04c7730b22fc42e798e2fa50c49bc81b4dba84d2f4753c0f97988e88a161e648f1d8
 MISC metadata.xml 1077 SHA256 1743d32d549a72c44492db4dedb7b5d6b54740df1361c9734ed87b3a4c28fe51 SHA512 d22f9cb914af834cf93c41859e9700898120824c529ff59fbc9629fa0bb517ee4bd5cfd7450ee6f0368a3d5745e2215fb2e2d7754e1c2248c023dba7eda2fe63 WHIRLPOOL 1ab28a8768e7498c24e418be3269954bf983e04a3c59c397df5f1263c139a78156554eba965f1fad3aaf49a2dbbffe09ac0f021e72502be917af1145673b0496
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJVfhjbAAoJECo/aRed9267CpwH/0HPM/iVGUvOuvKuy3PH0sR0
-2qytas5j1sDAjLi1K2/U6A7n9b7p7j4kczhV64NxeS+fM02n49ajzZi7OKMULxMf
-F3e/PJVDxY+UaD5aAYALnP9471qz8Hcp5BA1vFreDyd5ziLIH132W0jQVCkx0Cod
-vM29hfcwW2emXe0wOolCnbp7MBMWq3086+pAIMSn89Q6v9o1SAbgcgg6GCne9az6
-pDYEjWLMqTTEeu80dGmPBJXmn7HFG6zuJF1rjOQOWOoPZsZIb5a6SsgIli831oin
-PSTipCYerns9cSN2yCXahdTfZNw5b/WPKCfy9m2A5700yupym1cLgr2zUgyhDXE=
-=ZdaY
+iQEcBAEBCAAGBQJVkC3bAAoJECo/aRed9267wGIH/1U79Y0KZ7nsbsenKzzmiFKr
+TBhIvf1aeYBjsaO827DrWHqn/O4ygCMd82KeSVwjKcxEPADHfq8WYtA1kg8a34eS
+0m1cckSmZJc/trSSBUkWt/qDUvUAO9yG98B/1T2m4lKo9RZ67AaJY3nJmnav7Xfm
+8bUgfMgjmJnFNPwk9csTPguJ/7oIGSnZBUpmZ7yiKSclJbrcGlJepaZDSeqtCsi3
+mUk0Ij4Xknyd5ne+cApYOsslc2gMHeE7C+a/zTFjdjYYsasyyDf+zjkMq/ScKbB9
+iTuSs23S0ZQrErQe9TyKanrdClTvTeUS+BdvKcwmgahQipMsD6MNUB4dOkIU7nc=
+=xD0k
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/retroshare/files/retroshare-0.6.0-force-sqlcipher.patch b/net-p2p/retroshare/files/retroshare-0.6.0-force-sqlcipher.patch
deleted file mode 100644
index 2df08f13c767..000000000000
--- a/net-p2p/retroshare/files/retroshare-0.6.0-force-sqlcipher.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- retroshare-gui/src/retroshare-gui.pro.orig	2015-04-16 12:35:21.878472205 +0300
-+++ retroshare-gui/src/retroshare-gui.pro	2015-04-16 12:35:46.330471776 +0300
-@@ -84,21 +84,7 @@
- 

- 	SQLCIPHER_OK = $$system(pkg-config --exists sqlcipher && echo yes)

- 	isEmpty(SQLCIPHER_OK) {

--# We need a explicit path here, to force using the home version of sqlite3 that really encrypts the database.

--

--		exists(../../../lib/sqlcipher/.libs/libsqlcipher.a) {

--

--			LIBS += ../../../lib/sqlcipher/.libs/libsqlcipher.a

--			DEPENDPATH += ../../../lib/sqlcipher/src/

--			INCLUDEPATH += ../../../lib/sqlcipher/src/

--			DEPENDPATH += ../../../lib/sqlcipher/tsrc/

--			INCLUDEPATH += ../../../lib/sqlcipher/tsrc/

--		} else {

--			message(libsqlcipher.a not found. Compilation will not use SQLCIPHER. Database will be unencrypted.)

--			DEFINES *= NO_SQLCIPHER

--			LIBS *= -lsqlite3

--		}

--

-+		error(libsqlcipher.a not found)

- 	} else {

- 		LIBS += -lsqlcipher

- 	}

---- retroshare-nogui/src/retroshare-nogui.pro.orig	2015-04-16 12:36:00.940471520 +0300
-+++ retroshare-nogui/src/retroshare-nogui.pro	2015-04-16 12:36:32.459470968 +0300
-@@ -36,19 +36,7 @@
- 	gxs {

- 		SQLCIPHER_OK = $$system(pkg-config --exists sqlcipher && echo yes)

- 			isEmpty(SQLCIPHER_OK) {

--# We need a explicit path here, to force using the home version of sqlite3 that really encrypts the database.

--

--				exists(../../../lib/sqlcipher/.libs/libsqlcipher.a) {

--

--					LIBS += ../../../lib/sqlcipher/.libs/libsqlcipher.a

--						DEPENDPATH += ../../../lib/sqlcipher/src/

--						INCLUDEPATH += ../../../lib/sqlcipher/src/

--				} else {

--					message(libsqlcipher.a not found. Compilation will not use SQLCIPHER. Database will be unencrypted.)

--						DEFINES *= NO_SQLCIPHER

--						LIBS *= -lsqlite3

--				}

--

-+				error(libsqlcipher.a not found)

- 			} else {

- 				LIBS *= -lsqlcipher

- 			}

diff --git a/net-p2p/retroshare/retroshare-0.6.0_pre20150415.ebuild b/net-p2p/retroshare/retroshare-0.6.0_rc2_pre8551.ebuild
index 07cf6fa483da..fa1d2cca70a6 100644
--- a/net-p2p/retroshare/retroshare-0.6.0_pre20150415.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.0_rc2_pre8551.ebuild
@@ -1,21 +1,24 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/retroshare/retroshare-0.6.0_pre20150415.ebuild,v 1.2 2015/06/14 23:14:34 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/retroshare/retroshare-0.6.0_rc2_pre8551.ebuild,v 1.1 2015/06/28 17:24:32 pinkbyte Exp $
 
 EAPI=5
 
 inherit eutils gnome2-utils multilib qmake-utils
 
+MY_PV="${PV/_rc/.RC}"
+MY_PV="${MY_PV/_pre/~}"
+
 DESCRIPTION="P2P private sharing application"
 HOMEPAGE="http://retroshare.sourceforge.net"
-SRC_URI="http://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/retroshare/${PN}_${MY_PV}_src.tgz"
 
 # pegmarkdown can also be used with MIT
 LICENSE="GPL-2 GPL-3 Apache-2.0 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="cli feedreader qt5 voip"
+IUSE="cli feedreader +qt5 voip"
 REQUIRED_USE="|| ( cli qt5 )
 	feedreader? ( qt5 )
 	voip? ( qt5 )"
@@ -25,6 +28,7 @@ RDEPEND="
 	dev-db/sqlcipher
 	dev-libs/openssl:0
 	gnome-base/libgnome-keyring
+	net-libs/libmicrohttpd
 	net-libs/libupnp
 	sys-libs/zlib
 	cli? (
@@ -51,28 +55,34 @@ RDEPEND="
 		dev-qt/qtxml:5
 	)
 	voip? (
+		media-libs/opencv
 		media-libs/speex
 	)"
 DEPEND="${RDEPEND}
 	dev-qt/qtcore:5
 	virtual/pkgconfig"
 
+S="${WORKDIR}/retroshare06-0.6.0/src"
+
 src_prepare() {
 	local dir
 
 	sed -i \
-		-e "s|/usr/lib/retroshare/extensions/|/usr/$(get_libdir)/${PN}/extensions/|" \
+		-e "s|/usr/lib/retroshare/extensions6/|/usr/$(get_libdir)/${PN}/extensions6/|" \
 		libretroshare/src/rsserver/rsinit.cc \
-		|| die "sed failed"
+		|| die "sed on libretroshare/src/rsserver/rsinit.cc failed"
 
-	rs_src_dirs="libbitdht/src openpgpsdk/src libretroshare/src supportlibs/pegmarkdown"
+	rs_src_dirs="libbitdht/src openpgpsdk/src libresapi/src libretroshare/src supportlibs/pegmarkdown"
 	use cli && rs_src_dirs="${rs_src_dirs} retroshare-nogui/src"
-	use qt5 && rs_src_dirs="${rs_src_dirs} retroshare-gui/src"
 	use feedreader && rs_src_dirs="${rs_src_dirs} plugins/FeedReader"
-
+	use qt5 && rs_src_dirs="${rs_src_dirs} retroshare-gui/src"
 	use voip && rs_src_dirs="${rs_src_dirs} plugins/VOIP"
 
-	epatch "${FILESDIR}/${PN}-0.6.0-force-sqlcipher.patch"
+	# Force linking to sqlcipher ONLY
+	sed -i \
+		-e '/isEmpty(SQLCIPHER_OK) {/aerror(libsqlcipher not found)' \
+		retroshare-gui/src/retroshare-gui.pro \
+		retroshare-nogui/src/retroshare-nogui.pro || die 'sed on retroshare-gui/src/retroshare-gui.pro failed'
 
 	epatch_user
 }
@@ -97,7 +107,7 @@ src_compile() {
 
 src_install() {
 	local i
-	local extension_dir="/usr/$(get_libdir)/${PN}/extensions/"
+	local extension_dir="/usr/$(get_libdir)/${PN}/extensions6/"
 
 	use cli && dobin retroshare-nogui/src/retroshare-nogui
 	use qt5 && dobin retroshare-gui/src/RetroShare
@@ -109,6 +119,9 @@ src_install() {
 	insinto /usr/share/RetroShare06
 	doins libbitdht/src/bitdht/bdboot.txt
 
+	insinto /usr/share/RetroShare06/webui
+	doins libresapi/src/webfiles/*
+
 	dodoc README.txt
 	make_desktop_entry RetroShare
 	for i in 24 48 64 ; do