Version bump, take maintainership

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

5 files changed, 212 insertions, 20 deletions

diff --git a/net-p2p/retroshare/ChangeLog b/net-p2p/retroshare/ChangeLog
index b03c072c0877..c58171378709 100644
--- a/net-p2p/retroshare/ChangeLog
+++ b/net-p2p/retroshare/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-p2p/retroshare
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/retroshare/ChangeLog,v 1.9 2014/12/26 11:50:04 kensington Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/retroshare/ChangeLog,v 1.10 2015/04/27 09:51:51 pinkbyte Exp $
+
+*retroshare-0.6.0_pre20150415 (27 Apr 2015)
+
+  27 Apr 2015; Sergey Popov <pinkbyte@gentoo.org>
+  +retroshare-0.6.0_pre20150415.ebuild,
+  +files/retroshare-0.6.0-force-sqlcipher.patch, metadata.xml:
+  Version bump, take maintainership
 
   26 Dec 2014; Michael Palimaka <kensington@gentoo.org>
   -retroshare-0.5.4e.ebuild, -retroshare-0.5.5a.ebuild,
diff --git a/net-p2p/retroshare/Manifest b/net-p2p/retroshare/Manifest
index c4cd9e7d8630..b1345fdf5195 100644
--- a/net-p2p/retroshare/Manifest
+++ b/net-p2p/retroshare/Manifest
@@ -1,25 +1,21 @@
 -----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_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
 EBUILD retroshare-0.5.5c.ebuild 3036 SHA256 6635b4ca375be58e2e87554193b59e8d1d15b553daed2322228385135e362e0d SHA512 a7673e48fb6edaa751f407af4b3f5dbaea24fca58fb7eca332ba9a46ac6d4f7834dec613020f4403a455e6187039ddb8528d881e94eeee54c82c4ec11f3d3df8 WHIRLPOOL 1270352ae402b7181c8671e05251da5b6589606e0f06c27deeb74de0404a0dc83495f8ce8e50dc8ade43235278d0aa36b0411816a0d422d2105bebde8f8bb3bd
-MISC ChangeLog 1335 SHA256 d95e4b3f96167aec112bd178a312de3a40c076eb2c669d71af27f480a55f1768 SHA512 aa2dce15828694d047557130f1facbe67be66441971873c3407cbf799aa689ddb3e01d3056060ef58cb5d31b3cde2a9563b48b91aed7ff4707b95c58cba1f0f2 WHIRLPOOL 9df1f7d4e3b7e4f89cfe4d7e76f1664808ca1e3981ed7999cc5aab99d283f87b9faef2cc77dc68034bd9a70e6ff1ce1a4d7c166eea879c39a55b8a90082a9998
-MISC metadata.xml 1058 SHA256 6bd77ed997f27308d3ff8ed3dc881de6c1d4dc0611049042bf965684b0d78ed1 SHA512 947efd724c37a17a487c1f4a791b26f3854ca93d5ccbcdd8e753c2e3280d5f8a880b1b9e12ab0d4a1a0d068507e22c223794e60a48fac778ab4c3c61722374e4 WHIRLPOOL bbe97e6e77439904233e465752d845f86e63a04b16b1b5cc219896042f8c95da272c8caa2cc0690c3499c7a30b3e67ab5d4c8412615138fc98c9c060dbbb5aa1
+EBUILD retroshare-0.6.0_pre20150415.ebuild 3381 SHA256 08cfb5b43ad6a0335348b5d8a06ef498b20d1116a73db525c2ec399eded28628 SHA512 e19bd75d987ce3675c25982e02d1390dad6d873000597e2529972c89dfd8ea66905de3db6e97f7cbbf9a0b89e771eb3c4c4d3e18f58cd2249292cfb803fd0406 WHIRLPOOL 435a94bdc31bdedd7f06cc2187cad7432cd72375b638eaa976d3712c09c097ad655329fb35a10d8e1052d19b5d3266ccff6ea39b068dc47d6d4b4f7d14ea2a55
+MISC ChangeLog 1569 SHA256 1f5bb95c76d559a93da25caa42d209cb58ef4a39e44656b6e27ca1b9182c0d03 SHA512 ae820a87193d7f5c1568e70eacff4dac09e9d1d1040c648b1ec3ef6c3da0ee6ba02cc81e4769853a2ddf45e55c35f59bd9258d3c32d26ab1f0c246d027e3b338 WHIRLPOOL 04bb18dae3d6b3737b7d792e589db92b13bba0d3a53c1e6c67486ec64f171ec079abf69e04d0c6d8900651778f2afba761798e335b72caf05e4e7b147930e03a
+MISC metadata.xml 1077 SHA256 1743d32d549a72c44492db4dedb7b5d6b54740df1361c9734ed87b3a4c28fe51 SHA512 d22f9cb914af834cf93c41859e9700898120824c529ff59fbc9629fa0bb517ee4bd5cfd7450ee6f0368a3d5745e2215fb2e2d7754e1c2248c023dba7eda2fe63 WHIRLPOOL 1ab28a8768e7498c24e418be3269954bf983e04a3c59c397df5f1263c139a78156554eba965f1fad3aaf49a2dbbffe09ac0f021e72502be917af1145673b0496
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJiBAEBCABMBQJUnUt9RRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7EqKD/0ST2WGwJ4/lApH/PI9V0pCVf2+MDyGVj19Bp306d3pS71gSXqizkq23zer
-w21eSelhBRQ5uRpMyHOPtfilSY1AX1ApHB5IeZhYIz3Nd+DkIpNSqPoOVcGeLmxl
-60xOCCNXhvgK3ut1X4BbjHJXkblEpSzOBhPMl8OWwnmkezn7Gd9HZJts6ioBfXon
-XeAjzccmHJiWZ/tPPbbLjuQEEXylo80gI+ulf/zhnNTp7dbA9Bc42XoZtfl6GdfL
-RhACMfaXRZxOtRfMM65sswT/1gRkctaBrmEfn+W2CvdXglGoP0b52L9T8aE5mOSI
-QQ72fN5X1ZvWvlidUQ+Ql5ABOWNiDIb5Bo8eBB6OoPQVjsdclRjlZ2ex0SFgihEA
-3dhfCc5w9enzKUpZklbMEtujVTkYdQ05XqzvfU9NGA0uPDlOzfHEuEoTGLU6AGo2
-FEio1QQqqsrFFJBIhvUMGyVIzrd1VjUars9FxASKqMzPSSjbzy/G9cVExoUXtF06
-mAcZmXGJm4j/jt2v7QpUICwZIudW3ht+UPpMDMiIui/2hUkjhr2bQ0wF3gXecwZc
-iz7PppDCpFfalWZs48Pm1egFPAvvVPskTfaDn5Xy2/J7xCU3qDJjr9rrRv5DL3d8
-CCnjpE9+OMkEgcnx4v2sWVymNdNN4ejmjLsA6c2rVF/wPAPYiw==
-=tSIQ
+iQEcBAEBCAAGBQJVPga3AAoJECo/aRed9267SvQH/RbYbOZy9e+PUacQ5yeuGqX0
+0QUVxTEwh9tpeEg4K0BArsXwJPuaE1PVU93d1ufK8a/B1UxzjogLd7ypXPv/Gnbt
+nLu+Xc2MRAGFzj7iJsfdQN8YFuOyfRVCmTpax+51i2bY2LVk7gEiJc/bS/KieNGg
+0ni22kDGYkxEpJT9+eAXtwzRNGgKN8x6Uzh9uLjA1EJykWIo1OZVdEhQ+CUuy80v
+mHydz9UxmI2T/9PU6K+1Sxdq0+6p1PcuS3zWoxzExfNcKT6/gYYpYwqbShyXOC3o
+7EgWMhdRapM8os3dH8FXQOeHYO2sKl12IMTYMERI6GadERJZxv6g00q2asEubOg=
+=3n1G
 -----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
new file mode 100644
index 000000000000..2df08f13c767
--- /dev/null
+++ b/net-p2p/retroshare/files/retroshare-0.6.0-force-sqlcipher.patch
@@ -0,0 +1,48 @@
+--- 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/metadata.xml b/net-p2p/retroshare/metadata.xml
index 00f33f13e63e..c89173f98cc1 100644
--- a/net-p2p/retroshare/metadata.xml
+++ b/net-p2p/retroshare/metadata.xml
@@ -2,7 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
+		<email>pinkbyte@gentoo.org</email>
+		<name>Sergey Popov</name>
 	</maintainer>
 	<longdescription lang="en">
 		RetroShare is a Open Source cross-platform, Friend-2-Friend and
diff --git a/net-p2p/retroshare/retroshare-0.6.0_pre20150415.ebuild b/net-p2p/retroshare/retroshare-0.6.0_pre20150415.ebuild
new file mode 100644
index 000000000000..33293ebaed57
--- /dev/null
+++ b/net-p2p/retroshare/retroshare-0.6.0_pre20150415.ebuild
@@ -0,0 +1,140 @@
+# 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.1 2015/04/27 09:51:51 pinkbyte Exp $
+
+EAPI=5
+
+inherit eutils gnome2-utils multilib qmake-utils
+
+DESCRIPTION="P2P private sharing application"
+HOMEPAGE="http://retroshare.sourceforge.net"
+SRC_URI="http://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.bz2"
+
+# 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 links-cloud qt5 voip"
+REQUIRED_USE="|| ( cli qt5 )
+	feedreader? ( qt5 )
+	links-cloud? ( qt5 )
+	voip? ( qt5 )"
+
+RDEPEND="
+	app-arch/bzip2
+	dev-db/sqlcipher
+	dev-libs/openssl:0
+	gnome-base/libgnome-keyring
+	net-libs/libupnp
+	sys-libs/zlib
+	cli? (
+		dev-libs/protobuf
+		net-libs/libssh[server]
+	)
+	feedreader? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+		net-misc/curl
+	)
+	qt5? (
+		x11-libs/libX11
+		x11-libs/libXScrnSaver
+		dev-qt/designer:5
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtmultimedia:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtscript:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+		dev-qt/qtxml:5
+	)
+	voip? (
+		media-libs/speex
+	)"
+DEPEND="${RDEPEND}
+	dev-qt/qtcore:5
+	virtual/pkgconfig"
+
+src_prepare() {
+	local dir
+
+	sed -i \
+		-e "s|/usr/lib/retroshare/extensions/|/usr/$(get_libdir)/${PN}/extensions/|" \
+		libretroshare/src/rsserver/rsinit.cc \
+		|| die "sed failed"
+
+	rs_src_dirs="libbitdht/src openpgpsdk/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 links-cloud && rs_src_dirs="${rs_src_dirs} plugins/LinksCloud"
+	use feedreader && rs_src_dirs="${rs_src_dirs} plugins/FeedReader"
+
+	use voip && rs_src_dirs="${rs_src_dirs} plugins/VOIP"
+
+	epatch "${FILESDIR}/${PN}-0.6.0-force-sqlcipher.patch"
+
+	epatch_user
+}
+
+src_configure() {
+	for dir in ${rs_src_dirs} ; do
+		pushd "${S}/${dir}" 2>/dev/null || die
+		eqmake5
+		popd 2>/dev/null || die
+	done
+}
+
+src_compile() {
+	local dir
+
+	for dir in ${rs_src_dirs} ; do
+		emake -C "${dir}"
+	done
+
+	unset rs_src_dirs
+}
+
+src_install() {
+	local i
+	local extension_dir="/usr/$(get_libdir)/${PN}/extensions/"
+
+	use cli && dobin retroshare-nogui/src/retroshare-nogui
+	use qt5 && dobin retroshare-gui/src/RetroShare
+
+	exeinto "${extension_dir}"
+	use feedreader && doexe plugins/FeedReader/*.so*
+	use links-cloud && doexe plugins/LinksCloud/*.so*
+	use voip && doexe plugins/VOIP/*.so*
+
+	insinto /usr/share/RetroShare06
+	doins libbitdht/src/bitdht/bdboot.txt
+
+	dodoc README.txt
+	make_desktop_entry RetroShare
+	for i in 24 48 64 ; do
+		doicon -s ${i} "build_scripts/Debian+Ubuntu/data/${i}x${i}/${PN}.png"
+	done
+	doicon -s 128 "build_scripts/Debian+Ubuntu/data/${PN}.png"
+}
+
+pkg_preinst() {
+	if [[ "${REPLACING_VERSIONS}" = "0.5*"  ]]; then
+		elog "You are upgrading from Retroshare 0.5.* to ${PV}"
+		elog "Version 0.6.* is backward-incompatible with 0.5 branch"
+		elog "and clients with 0.6.* can not connect to clients that have 0.5.*"
+		elog "It's recommended to drop all your configuration and either"
+		elog "generate a new certificate or import existing from a backup"
+	fi
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}