[patch] patch

spideroak-bin-4.2.9913-r1.ebuild.patch (text/plain), 2.25 KB, created by Dennis Schridde on 2012-01-10 01:22:02 UTC

--- spideroak-bin-4.2.9913.ebuild	2012-01-10 01:35:41.791999992 +0100
+++ spideroak-bin-4.2.9913-r1.ebuild	2012-01-10 02:08:56.543999992 +0100
@@ -18,12 +18,14 @@
 LICENSE="spideroak"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="dbus headless pycurl-bundled qt-bundled"
+IUSE="dbus headless"
 RESTRICT="strip"
 
 RDEPEND="dev-db/sqlite:3
 	>=dev-libs/glib-2.22.0
+	dev-lang/python:2.7
 	dev-libs/openssl:0.9.8
+	dev-python/pycurl
 	media-libs/libpng:1.2
 	>=sys-devel/gcc-4
 	>=sys-libs/glibc-2.7
@@ -37,19 +39,14 @@
 		x11-libs/libX11
 		x11-libs/libXext
 		x11-libs/libXrender
-		!qt-bundled? ( x11-libs/qt-gui:4[accessibility,dbus] )
-	)
-	pycurl-bundled? (
-		net-libs/libssh2
-		net-misc/curl
-	)
-	!pycurl-bundled? ( dev-python/pycurl )"
+		x11-libs/qt-gui:4[accessibility,dbus]
+	)"
 DEPEND="${RDEPEND}"
 
 S=${WORKDIR}
 
 QA_PREBUILT="*"
 
 src_unpack() {
 	unpack ${A}
 	unpack ./data.tar.gz
@@ -67,19 +64,18 @@
 		sed -i 's:"$@":--headless "$@":' usr/bin/SpiderOak || die "sed failed"
 	fi
 
-	# remove shipped libstdc++.so.6 as it does not provide LIBCXX_3.4.11
-	# and it seems to work alright with the one from >=gcc-4
-	rm usr/lib/SpiderOak/libstdc++.so.6 || die "rm libstdc++.so.6 failed"
-
-	if ! use qt-bundled || use headless ; then
-		# rm precompiled and bundled qt libs
-		rm usr/lib/SpiderOak/libQt*.so.4 || die "rm libQt*.so.4 failed"
-	fi
+	# rm python interpreter
+	rm usr/lib/SpiderOak/py || die "rm py failed"
 
-	if ! use pycurl-bundled ; then
-		# rm precompiled and bundled pycurl
-		rm usr/lib/SpiderOak/pycurl.so
-	fi
+	# rm precompiled and bundled libs
+	# WARNING: libpcre.so.3: Gentoo ships incompatible SOVERSION 0, but the library seems unused anyway
+	for lib in libcrypto.so.0.9.8 libcurl.so.4 libexpat.so.1 libgcc_s.so.1 libpcre.so.3 libpng12.so.0 libQt*.so.4 libsqlite3.so.0 libssh2.so.1 libssl.so.0.9.8 libstdc++.so.6 libz.so.1 ; do
+		rm usr/lib/SpiderOak/$lib || die "rm $lib failed"
+	done
+	# rm precompiled and bundled python modules
+	for pymod in pycurl.so pyexpat.so ; do
+		rm usr/lib/SpiderOak/$pymod || die "rm $pymod failed"
+	done
 }
 
 src_install() {
@@ -88,9 +84,8 @@
 
 	exeinto /opt/SpiderOak
 	doexe usr/lib/SpiderOak/SpiderOak
 	doexe usr/lib/SpiderOak/inotify_dir_watcher
-	doexe usr/lib/SpiderOak/py
 
 	exeinto /opt/bin
 	doexe usr/bin/SpiderOak