* [gentoo-commits] dev/blueness:master commit in: app-backup/spideroak-bin/files/, app-backup/spideroak-bin/
@ 2012-01-10 15:44 Anthony G. Basile
0 siblings, 0 replies; 4+ messages in thread
From: Anthony G. Basile @ 2012-01-10 15:44 UTC (permalink / raw
To: gentoo-commits
commit: 568809430e481a3682ed56eefe4e4dcc9fbaa559
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 10 15:44:46 2012 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Jan 10 15:44:46 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=56880943
app-backup/spideroak-bin: merging my ebuild with tree's
---
app-backup/spideroak-bin/Manifest | 4 +
app-backup/spideroak-bin/files/opt-path.patch | 12 +++
app-backup/spideroak-bin/metadata.xml | 23 +++++
.../spideroak-bin/spideroak-bin-4.2.9913.ebuild | 86 ++++++++++++++++++++
4 files changed, 125 insertions(+), 0 deletions(-)
diff --git a/app-backup/spideroak-bin/Manifest b/app-backup/spideroak-bin/Manifest
new file mode 100644
index 0000000..6d571e6
--- /dev/null
+++ b/app-backup/spideroak-bin/Manifest
@@ -0,0 +1,4 @@
+DIST spideroak-bin-4.2.9913_amd64.deb 24566640 RMD160 2ce797732ca6e157c7a2e93cede44cc18aec6fd8 SHA1 141de5c7fa4b17c9cc2fd074336a80f00da649b7 SHA256 4d0491e8b52503fa4cd5cf38cf235a946c9b9d28e1b01c5d2f02c2cdb97a6bff
+DIST spideroak-bin-4.2.9913_x86.deb 23969878 RMD160 c083bb88033eda8600b190e57f063c94cf1e48b5 SHA1 1d9a2d3450a8ec737740c3a4308082679bf5479d SHA256 0e460c1d89c9284201b6537dcee5ae4078de422f5f426202ca24f28b59bd1a61
+EBUILD spideroak-bin-4.2.9913.ebuild 3041 RMD160 1ac5b2d8d8a7240e76fab34468c13f27c4adc57b SHA1 7339a34504dc76e0167a4f1bf64672a9e201c096 SHA256 01b1036fd086fae06c0b5adee30f1cdc6f41317025b84af1a513d9cc877a9fa0
+MISC metadata.xml 690 RMD160 10e629b3e5bf0bfdd55aa1df775ddefb8cb915bd SHA1 72b64b4f98e4731e527468c601d37e1468c4b02a SHA256 d756681b36f4120db893d13daa563f01fd3bd62694f53c86a24d7c2d9a31123d
diff --git a/app-backup/spideroak-bin/files/opt-path.patch b/app-backup/spideroak-bin/files/opt-path.patch
new file mode 100644
index 0000000..50b7017
--- /dev/null
+++ b/app-backup/spideroak-bin/files/opt-path.patch
@@ -0,0 +1,12 @@
+diff -Naur spideroak-9913.orig//usr/bin/SpiderOak spideroak-9913/usr/bin/SpiderOak
+--- spideroak-9913.orig//usr/bin/SpiderOak 2011-12-26 16:27:35.000000000 -0500
++++ spideroak-9913/usr/bin/SpiderOak 2012-01-09 10:04:03.000000000 -0500
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+
+-LD_LIBRARY_PATH="/usr/lib/SpiderOak:$LD_LIBRARY_PATH"
++LD_LIBRARY_PATH="/opt/spideroak/usr/lib/SpiderOak:$LD_LIBRARY_PATH"
+ export LD_LIBRARY_PATH
+ QT_PLUGIN_PATH= ; export QT_PLUGIN_PATH
+-exec "/usr/lib/SpiderOak/SpiderOak" "$@"
++exec "/opt/spideroak/usr/lib/SpiderOak/SpiderOak" "$@"
diff --git a/app-backup/spideroak-bin/metadata.xml b/app-backup/spideroak-bin/metadata.xml
new file mode 100644
index 0000000..2dbb3ca
--- /dev/null
+++ b/app-backup/spideroak-bin/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+ <email>devurandom@gmx.net</email>
+ <name>Dennis Schridde</name>
+ <description>Maintainer.</description>
+</maintainer>
+<maintainer>
+ <email>naota@gentoo.org</email>
+ <name>Naohiro Aota</name>
+ <description>Proxy maintainer.</description>
+</maintainer>
+<maintainer>
+ <email>blueness@gentoo.org</email>
+ <name>Anthony G. Basile</name>
+</maintainer>
+<use>
+ <flag name='headless'>Build without graphic frontend</flag>
+ <flag name='pycurl-bundled'>Use bundled pycurl</flag>
+ <flag name='qt-bundled'>Use bundled Qt4 libraries</flag>
+</use>
+</pkgmetadata>
diff --git a/app-backup/spideroak-bin/spideroak-bin-4.2.9913.ebuild b/app-backup/spideroak-bin/spideroak-bin-4.2.9913.ebuild
new file mode 100644
index 0000000..5d2ce00
--- /dev/null
+++ b/app-backup/spideroak-bin/spideroak-bin-4.2.9913.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/spideroak-bin/spideroak-bin-4.2.9907.ebuild,v 1.1 2011/12/10 00:34:07 naota Exp $
+
+EAPI="4"
+
+inherit eutils versionator
+
+REV=$(get_version_component_range 3)
+SRC_URI_BASE="https://spideroak.com/directdownload?platform=ubuntulucid"
+
+DESCRIPTION="An easy, secure and consolidated free online backup, storage, access and sharing system."
+HOMEPAGE="https://spideroak.com"
+SRC_URI="x86? ( ${SRC_URI_BASE}&arch=i386&revision=${REV} -> ${P}_x86.deb )
+ amd64? ( ${SRC_URI_BASE}&arch=x86_64&revision=${REV} -> ${P}_amd64.deb )"
+RESTRICT="mirror strip"
+
+LICENSE="spideroak"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus headless"
+
+DEPEND=""
+RDEPEND="
+ >=dev-libs/glib-2.22.0
+ media-libs/libpng:1.2
+ >=sys-devel/gcc-4
+ >=sys-libs/glibc-2.7
+ dbus? ( sys-apps/dbus )
+ !headless? (
+ >=media-libs/fontconfig-2.8.0
+ >=media-libs/freetype-2.3.5
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXrender
+ )"
+
+S=${WORKDIR}
+
+QA_PREBUILT="*"
+
+src_unpack() {
+ unpack ${A}
+ unpack ./data.tar.gz
+ rm -f control.tar.gz data.tar.gz debian-binary
+ rm -f usr/share/doc/spideroak/copyright
+ mv usr/share/doc/spideroak usr/share/doc/${P}
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/opt-path.patch
+}
+
+src_install() {
+ insinto /opt/${PN}
+ doins -r usr/lib/SpiderOak/*
+
+ exeinto /usr/bin
+ doexe usr/bin/SpiderOak
+
+ #exeinto /opt/SpiderOak
+ #doexe usr/lib/SpiderOak/SpiderOak
+
+ if use dbus ; then
+ insinto /etc/dbus-1
+ doins -r etc/dbus-1/*
+ fi
+
+ insinto /usr/share/doc/${P}
+ doins usr/share/doc/${P}/changelog.gz
+
+ if ! use headless ; then
+ domenu usr/share/applications/spideroak.desktop
+ doicon usr/share/pixmaps/spideroak.png
+ fi
+}
+
+pkg_postinst() {
+ if use headless ; then
+ einfo "For instructions on running SpiderOak without a GUI, please read the FAQ:"
+ einfo " https://spideroak.com/faq/questions/62/how_do_i_install_spideroak_on_a_headless_linux_server/"
+ einfo " https://spideroak.com/faq/questions/67/how_can_i_use_spideroak_from_the_commandline/"
+ fi
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] dev/blueness:master commit in: app-backup/spideroak-bin/files/, app-backup/spideroak-bin/
@ 2012-01-10 16:21 Anthony G. Basile
0 siblings, 0 replies; 4+ messages in thread
From: Anthony G. Basile @ 2012-01-10 16:21 UTC (permalink / raw
To: gentoo-commits
commit: d7c2cfab5ca6688d3a41459e66671af6fc2daa69
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 10 16:21:36 2012 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Jan 10 16:21:36 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=d7c2cfab
app-backup/spideroak-bin: working merged version
(Portage version: 2.1.10.41/git/Linux x86_64, signed Manifest commit with key 0xD0455535)
---
app-backup/spideroak-bin/Manifest | 15 ++++++++++-
app-backup/spideroak-bin/files/opt-path.patch | 10 ++++----
app-backup/spideroak-bin/metadata.xml | 2 -
.../spideroak-bin/spideroak-bin-4.2.9913.ebuild | 25 +++++++++++--------
4 files changed, 32 insertions(+), 20 deletions(-)
diff --git a/app-backup/spideroak-bin/Manifest b/app-backup/spideroak-bin/Manifest
index 6d571e6..14f7a66 100644
--- a/app-backup/spideroak-bin/Manifest
+++ b/app-backup/spideroak-bin/Manifest
@@ -1,4 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX opt-path.patch 451 RMD160 d5d3494d6cfdfce1a1dc61bc239d1990fabe78b0 SHA1 842d8ff4c83078e21ce2e7f8525f45da9423ce70 SHA256 a0ad54882ef97b75e74e1dcbe5684014f2b19b630a933bb8138286c8929e3576
DIST spideroak-bin-4.2.9913_amd64.deb 24566640 RMD160 2ce797732ca6e157c7a2e93cede44cc18aec6fd8 SHA1 141de5c7fa4b17c9cc2fd074336a80f00da649b7 SHA256 4d0491e8b52503fa4cd5cf38cf235a946c9b9d28e1b01c5d2f02c2cdb97a6bff
DIST spideroak-bin-4.2.9913_x86.deb 23969878 RMD160 c083bb88033eda8600b190e57f063c94cf1e48b5 SHA1 1d9a2d3450a8ec737740c3a4308082679bf5479d SHA256 0e460c1d89c9284201b6537dcee5ae4078de422f5f426202ca24f28b59bd1a61
-EBUILD spideroak-bin-4.2.9913.ebuild 3041 RMD160 1ac5b2d8d8a7240e76fab34468c13f27c4adc57b SHA1 7339a34504dc76e0167a4f1bf64672a9e201c096 SHA256 01b1036fd086fae06c0b5adee30f1cdc6f41317025b84af1a513d9cc877a9fa0
-MISC metadata.xml 690 RMD160 10e629b3e5bf0bfdd55aa1df775ddefb8cb915bd SHA1 72b64b4f98e4731e527468c601d37e1468c4b02a SHA256 d756681b36f4120db893d13daa563f01fd3bd62694f53c86a24d7c2d9a31123d
+EBUILD spideroak-bin-4.2.9913.ebuild 2188 RMD160 3b5e9f33d494d90d9106a25eceeb65ef4543883b SHA1 8a93c34302cb1d65c9980ad5a725dcf174584bfa SHA256 13e45e454254c48e884989017ed660f55903c4c1c1a9ae88c9f0cd3075e42798
+MISC metadata.xml 575 RMD160 530b6644aec999259cedef14983ff0e91767121c SHA1 daa48e245d77a1e0f33ed73750156554fd48a1cf SHA256 8468a02850b2a6e0bff2b603d67ba2ddd59c92ca4d04f8cf9bfb79b88e5b5b31
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEAREIAAYFAk8MZZAACgkQl5yvQNBFVTVEjgCcCSLXuPSLtSdv8jKr/IS2lz8d
+KtgAn2sL+exLgVRFeHnyThkwOBMy4vWB
+=3q4p
+-----END PGP SIGNATURE-----
diff --git a/app-backup/spideroak-bin/files/opt-path.patch b/app-backup/spideroak-bin/files/opt-path.patch
index 50b7017..adee3e1 100644
--- a/app-backup/spideroak-bin/files/opt-path.patch
+++ b/app-backup/spideroak-bin/files/opt-path.patch
@@ -1,12 +1,12 @@
-diff -Naur spideroak-9913.orig//usr/bin/SpiderOak spideroak-9913/usr/bin/SpiderOak
---- spideroak-9913.orig//usr/bin/SpiderOak 2011-12-26 16:27:35.000000000 -0500
-+++ spideroak-9913/usr/bin/SpiderOak 2012-01-09 10:04:03.000000000 -0500
+diff -Naur a/usr/bin/SpiderOak b/usr/bin/SpiderOak
+--- a/usr/bin/SpiderOak 2011-12-26 16:27:35.000000000 -0500
++++ b/usr/bin/SpiderOak 2012-01-09 10:04:03.000000000 -0500
@@ -1,6 +1,6 @@
#!/bin/sh
-LD_LIBRARY_PATH="/usr/lib/SpiderOak:$LD_LIBRARY_PATH"
-+LD_LIBRARY_PATH="/opt/spideroak/usr/lib/SpiderOak:$LD_LIBRARY_PATH"
++LD_LIBRARY_PATH="/opt/SpiderOak:$LD_LIBRARY_PATH"
export LD_LIBRARY_PATH
QT_PLUGIN_PATH= ; export QT_PLUGIN_PATH
-exec "/usr/lib/SpiderOak/SpiderOak" "$@"
-+exec "/opt/spideroak/usr/lib/SpiderOak/SpiderOak" "$@"
++exec "/opt/SpiderOak/SpiderOak" "$@"
diff --git a/app-backup/spideroak-bin/metadata.xml b/app-backup/spideroak-bin/metadata.xml
index 2dbb3ca..bd20627 100644
--- a/app-backup/spideroak-bin/metadata.xml
+++ b/app-backup/spideroak-bin/metadata.xml
@@ -17,7 +17,5 @@
</maintainer>
<use>
<flag name='headless'>Build without graphic frontend</flag>
- <flag name='pycurl-bundled'>Use bundled pycurl</flag>
- <flag name='qt-bundled'>Use bundled Qt4 libraries</flag>
</use>
</pkgmetadata>
diff --git a/app-backup/spideroak-bin/spideroak-bin-4.2.9913.ebuild b/app-backup/spideroak-bin/spideroak-bin-4.2.9913.ebuild
index 5d2ce00..ffa4d25 100644
--- a/app-backup/spideroak-bin/spideroak-bin-4.2.9913.ebuild
+++ b/app-backup/spideroak-bin/spideroak-bin-4.2.9913.ebuild
@@ -46,7 +46,6 @@ src_unpack() {
unpack ./data.tar.gz
rm -f control.tar.gz data.tar.gz debian-binary
rm -f usr/share/doc/spideroak/copyright
- mv usr/share/doc/spideroak usr/share/doc/${P}
}
src_prepare() {
@@ -54,27 +53,31 @@ src_prepare() {
}
src_install() {
- insinto /opt/${PN}
- doins -r usr/lib/SpiderOak/*
-
+ #install the executable script
exeinto /usr/bin
doexe usr/bin/SpiderOak
- #exeinto /opt/SpiderOak
- #doexe usr/lib/SpiderOak/SpiderOak
+ #install the prebundled libraries
+ dodir /opt
+ cp -pPR usr/lib/SpiderOak "${ED}"/opt/
- if use dbus ; then
- insinto /etc/dbus-1
- doins -r etc/dbus-1/*
- fi
+ #install the config files
+ rm -rf etc/apt
+ use dbus || rm -rf etc/dbus-1
+ insinto /
+ doins -r etc
+ #install the changelog
insinto /usr/share/doc/${P}
- doins usr/share/doc/${P}/changelog.gz
+ doins usr/share/doc/spideroak/changelog.gz
if ! use headless ; then
domenu usr/share/applications/spideroak.desktop
doicon usr/share/pixmaps/spideroak.png
fi
+
+ #remove the rest of the cruft
+ rm -rf usr
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] dev/blueness:master commit in: app-backup/spideroak-bin/files/, app-backup/spideroak-bin/
@ 2012-01-22 0:39 Anthony G. Basile
0 siblings, 0 replies; 4+ messages in thread
From: Anthony G. Basile @ 2012-01-22 0:39 UTC (permalink / raw
To: gentoo-commits
commit: 118680c4e02a874c3ece3b4070060ce36aebd9d4
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 22 00:39:49 2012 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Jan 22 00:39:49 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=118680c4
app-backup/spideroak-bin: added USE=system-libs
(Portage version: 2.1.10.41/git/Linux x86_64, signed Manifest commit with key 0xD0455535)
---
app-backup/spideroak-bin/Manifest | 14 +--
app-backup/spideroak-bin/files/headless.patch | 9 ++
app-backup/spideroak-bin/metadata.xml | 1 +
.../spideroak-bin/spideroak-bin-4.1.9860.ebuild | 107 --------------------
.../spideroak-bin/spideroak-bin-4.2.9913.ebuild | 81 ++++++++++++++-
5 files changed, 91 insertions(+), 121 deletions(-)
diff --git a/app-backup/spideroak-bin/Manifest b/app-backup/spideroak-bin/Manifest
index 2ea8d73..31479ff 100644
--- a/app-backup/spideroak-bin/Manifest
+++ b/app-backup/spideroak-bin/Manifest
@@ -1,18 +1,16 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
+AUX headless.patch 382 RMD160 e89c61b7eb0a54f844f760a68dc22c83083a4e0d SHA1 7271007194cc6d67b909e6633b495f6b4442d66d SHA256 a3869eec6d9837613bddfa3a3bdde8737bbb5b3c47fede28c2de7e412e5a56f4
AUX opt-path.patch 451 RMD160 d5d3494d6cfdfce1a1dc61bc239d1990fabe78b0 SHA1 842d8ff4c83078e21ce2e7f8525f45da9423ce70 SHA256 a0ad54882ef97b75e74e1dcbe5684014f2b19b630a933bb8138286c8929e3576
-DIST spideroak-bin-4.1.9860_amd64.deb 24201826 RMD160 3527477a9b85b69f04ec21f11660f32e1e0604b9 SHA1 836f4c5b0ab5f4967a5757a9efc8af5f8b347236 SHA256 3f6ba38c3793391dc679953f65cefc3e58017650ffc83251a1c54f4c09bfec6f
-DIST spideroak-bin-4.1.9860_x86.deb 23635590 RMD160 bc423c3b5713986ddfec292340cb82e33dad7360 SHA1 93a658745d2248d39518690d5a0e588b1eac67e3 SHA256 2850bddf8a227e14b6b4fc1590e3a1c49ee5a31d23d154610785daaf1aa52df1
DIST spideroak-bin-4.2.9913_amd64.deb 24566640 RMD160 2ce797732ca6e157c7a2e93cede44cc18aec6fd8 SHA1 141de5c7fa4b17c9cc2fd074336a80f00da649b7 SHA256 4d0491e8b52503fa4cd5cf38cf235a946c9b9d28e1b01c5d2f02c2cdb97a6bff
DIST spideroak-bin-4.2.9913_x86.deb 23969878 RMD160 c083bb88033eda8600b190e57f063c94cf1e48b5 SHA1 1d9a2d3450a8ec737740c3a4308082679bf5479d SHA256 0e460c1d89c9284201b6537dcee5ae4078de422f5f426202ca24f28b59bd1a61
-EBUILD spideroak-bin-4.1.9860.ebuild 3081 RMD160 5855579e85724067cb212708792c34a50962ccf1 SHA1 735b9a3df5c34626d0888d85a03583fdd7e05527 SHA256 6fff9ecdf450b1b2d8431ff4fd9f37510c7387a89ed6a8c7aed949d40c7c8d3a
-EBUILD spideroak-bin-4.2.9913.ebuild 2086 RMD160 347e380b5063dd97c829fe2218bcee39d7e9614e SHA1 160e9fad8cc1c779d0aec98c00d26f0ab9eae7c4 SHA256 b6b282bfc15c72aeb0267d51580a39317ef244bcc6b6956336e6a87d5ed5f291
-MISC metadata.xml 575 RMD160 530b6644aec999259cedef14983ff0e91767121c SHA1 daa48e245d77a1e0f33ed73750156554fd48a1cf SHA256 8468a02850b2a6e0bff2b603d67ba2ddd59c92ca4d04f8cf9bfb79b88e5b5b31
+EBUILD spideroak-bin-4.2.9913.ebuild 4189 RMD160 122d0d5b404013e6117405efbd700ff50121ab4b SHA1 24731ddf5b055b4a725cd88a49836912109b2cef SHA256 f8d0012b560c8d728d07214ae3a2dae3808e600c0346d73cbc6c5c08e01b4ad7
+MISC metadata.xml 649 RMD160 f0b82c20c49447d5428ad8cf3835b25707945454 SHA1 db1eb9f96b460029722495d7e12d2149b46837a1 SHA256 a11de661a97aa295ba5fe4597118cf559b4b794f5438f1d1d9670a6067b777fb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEAREIAAYFAk8bGFwACgkQl5yvQNBFVTXh2gCeOO9eIx0rzmO7s61aMUL1Wzny
-xS0AnRT9lpHOTq3tThU6RFcDStnNfpA6
-=cox+
+iEYEAREIAAYFAk8bWtUACgkQl5yvQNBFVTU9UwCgmjaCzi1nV90+Xd5sB5SYeh/P
+/vIAnjvweg36+GxZm6F92rNFanrjB5dd
+=asnY
-----END PGP SIGNATURE-----
diff --git a/app-backup/spideroak-bin/files/headless.patch b/app-backup/spideroak-bin/files/headless.patch
new file mode 100644
index 0000000..e1b6c46
--- /dev/null
+++ b/app-backup/spideroak-bin/files/headless.patch
@@ -0,0 +1,9 @@
+diff -Naur usr/bin/SpiderOak usr/bin/SpiderOak
+--- usr/bin/SpiderOak 2012-01-21 19:32:02.000000000 -0500
++++ usr/bin/SpiderOak 2012-01-21 19:32:57.000000000 -0500
+@@ -3,4 +3,4 @@
+ LD_LIBRARY_PATH="/opt/SpiderOak:$LD_LIBRARY_PATH"
+ export LD_LIBRARY_PATH
+ QT_PLUGIN_PATH= ; export QT_PLUGIN_PATH
+-exec "/opt/SpiderOak/SpiderOak" "$@"
++exec "/opt/SpiderOak/SpiderOak" --headless "$@"
diff --git a/app-backup/spideroak-bin/metadata.xml b/app-backup/spideroak-bin/metadata.xml
index bd20627..15f715e 100644
--- a/app-backup/spideroak-bin/metadata.xml
+++ b/app-backup/spideroak-bin/metadata.xml
@@ -17,5 +17,6 @@
</maintainer>
<use>
<flag name='headless'>Build without graphic frontend</flag>
+ <flag name='system-libs'>Remove bundled libs and use system libs</flag>
</use>
</pkgmetadata>
diff --git a/app-backup/spideroak-bin/spideroak-bin-4.1.9860.ebuild b/app-backup/spideroak-bin/spideroak-bin-4.1.9860.ebuild
deleted file mode 100644
index 8b00d95..0000000
--- a/app-backup/spideroak-bin/spideroak-bin-4.1.9860.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/spideroak-bin/spideroak-bin-4.1.9860.ebuild,v 1.4 2011/12/14 18:18:10 ago Exp $
-
-EAPI=4
-
-inherit eutils versionator
-
-REV=$(get_version_component_range 3)
-SRC_URI_BASE="https://spideroak.com/directdownload?platform=ubuntulucid"
-
-DESCRIPTION="An easy, secure and consolidated free online backup, storage, access and sharing system."
-HOMEPAGE="https://spideroak.com"
-SRC_URI="x86? ( ${SRC_URI_BASE}&arch=i386&revision=${REV} -> ${P}_x86.deb )
- amd64? ( ${SRC_URI_BASE}&arch=x86_64&revision=${REV} -> ${P}_amd64.deb )"
-RESTRICT="mirror strip"
-
-LICENSE="spideroak"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbus headless"
-
-RDEPEND="dev-db/sqlite:3
- >=dev-libs/glib-2.12.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
- dbus? ( sys-apps/dbus )
- !headless? (
- >=media-libs/fontconfig-2.4.0
- >=media-libs/freetype-2.3.5
- >=x11-libs/libICE-1.0.0
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXrender
- x11-libs/qt-gui:4[accessibility,dbus]
- )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}
-
-src_unpack() {
- unpack ${A}
- unpack ./data.tar.gz
- rm -f control.tar.gz data.tar.gz debian-binary
-}
-
-src_prepare() {
- # change /usr/ to /opt/SpiderOak/ in start script
- sed -i 's:/usr/lib:/opt:g' usr/bin/SpiderOak || die "sed failed"
- # change /usr/ to /opt/ in .desktop file
- sed -i 's:/usr/bin/SpiderOak:/opt/bin/SpiderOak:g' usr/share/applications/spideroak.desktop || die "sed failed"
-
- # disable GUI if headless useflag is enabled
- if use headless; then
- sed -i 's:"$@":--headless "$@":' usr/bin/SpiderOak || die "sed failed"
- fi
-
- # rm python interpreter
- rm usr/lib/SpiderOak/py || die "rm py failed"
-
- # 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() {
- insinto /opt/SpiderOak
- doins -r usr/lib/SpiderOak/*
-
- exeinto /opt/SpiderOak
- doexe usr/lib/SpiderOak/SpiderOak
-
- exeinto /opt/bin
- doexe usr/bin/SpiderOak
-
- if use dbus; then
- insinto /etc/dbus-1
- doins -r etc/dbus-1/*
- fi
-
- if ! use headless; then
- domenu usr/share/applications/spideroak.desktop
- doicon usr/share/pixmaps/spideroak.png
- fi
-}
-
-pkg_postinst() {
- if use headless ; then
- einfo "For instructions on running SpiderOak without a GUI, please read the FAQ:"
- einfo " https://spideroak.com/faq/questions/62/how_do_i_install_spideroak_on_a_headless_linux_server/"
- einfo " https://spideroak.com/faq/questions/67/how_can_i_use_spideroak_from_the_commandline/"
- fi
-}
diff --git a/app-backup/spideroak-bin/spideroak-bin-4.2.9913.ebuild b/app-backup/spideroak-bin/spideroak-bin-4.2.9913.ebuild
index 132ab9d..63fa8a9 100644
--- a/app-backup/spideroak-bin/spideroak-bin-4.2.9913.ebuild
+++ b/app-backup/spideroak-bin/spideroak-bin-4.2.9913.ebuild
@@ -18,7 +18,9 @@ RESTRICT="mirror strip"
LICENSE="spideroak"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="dbus headless"
+IUSE="dbus headless system-libs"
+
+SSL_SLOT="0.9.8"
DEPEND=""
RDEPEND="
@@ -26,12 +28,32 @@ RDEPEND="
!headless? (
media-libs/fontconfig
media-libs/freetype:2
+ dev-libs/glib:2
x11-libs/libICE
x11-libs/libSM
x11-libs/libX11
x11-libs/libXext
+ x11-libs/libXmu
x11-libs/libXrender
- )"
+ x11-libs/libXt
+ )
+ system-libs? (
+ dev-libs/openssl:$SSL_SLOT
+ net-misc/curl
+ >=sys-devel/gcc-4
+ dev-libs/glib:2
+ dev-libs/libpcre
+ media-libs/libpng:1.2
+ x11-libs/qt-core
+ x11-libs/qt-gui
+ dev-db/sqlite:3
+ net-libs/libssh2
+ sys-libs/libstdc++-v3:5
+ sys-libs/zlib
+ dev-lang/python:2.7
+ dev-python/pycurl
+ )
+"
S=${WORKDIR}
@@ -46,6 +68,51 @@ src_unpack() {
src_prepare() {
epatch "${FILESDIR}"/opt-path.patch
+ use headless && epatch "${FILESDIR}"/headless.patch
+
+ # Remove bundled libraries/plugins/python interpreter. Please keep this
+ # mapping in sync with the RDEPEND system-libs? ( atoms ) above, and the
+ # list of deleted files below
+ #
+ # libcrypto.so.0.$SSL_SLOT libssl.so.$SSL_SLOT => dev-libs/openssl:$SSL_SLOT
+ # libcurl.so* => net-misc/curl
+ # libexpat.so* => dev-libs/expat
+ # libgcc_s.so => >=sys-devel/gcc-4
+ # libpcre.so* => dev-libs/libpcre
+ # libpng12* => media-libs/libpng:1.2
+ # libQt*.so* => x11-libs/qt-core x11-libs/qt-gui
+ # libsqlite3.so* => dev-db/sqlite:3
+ # libssh2.so* => net-libs/libssh2
+ # libstdc++.so* => /sys-libs/libstdc++-v3:5
+ # libz.so* => sys-libs/zlib
+ #
+ # pycurl.so pyexpat.so => dev-python/pycurl
+ #
+ # usr/lib/SpiderOak/py => dev-lang/python:2.7
+ #
+ if use system-libs; then
+ for lib in \
+ libcrypto.so.$SSL_SLOT \
+ libssl.so.$SSL_SLOT \
+ libcurl.so* \
+ libexpat.so* \
+ libgcc_s.so* \
+ libpcre.so* \
+ libpng12* \
+ libQt*.so* \
+ libsqlite3.so* \
+ libssh2.so* \
+ libstdc++.so* \
+ libz.so* \
+ pycurl.so \
+ pyexpat.so
+ do
+ rm usr/lib/SpiderOak/$lib || die "rm $lib failed"
+ done
+
+ # Remove bundled python interpreter => dev-lang/python:2.7
+ rm usr/lib/SpiderOak/py || die "rm py failed"
+ fi
}
src_install() {
@@ -71,15 +138,17 @@ src_install() {
domenu usr/share/applications/spideroak.desktop
doicon usr/share/pixmaps/spideroak.png
fi
-
- #remove the rest of the cruft
- rm -rf usr
}
pkg_postinst() {
- if use headless ; then
+ if use headless; then
einfo "For instructions on running SpiderOak without a GUI, please read the FAQ:"
einfo " https://spideroak.com/faq/questions/62/how_do_i_install_spideroak_on_a_headless_linux_server/"
einfo " https://spideroak.com/faq/questions/67/how_can_i_use_spideroak_from_the_commandline/"
fi
+ if use system-libs; then
+ einfo "You have chosen to use your system libraries rather than the libraries that SpiderOak"
+ einfo "bundles with their software. The advantage to doing so is that it reduce the size of"
+ einfo "the package on your hard drive. However, upstream discourages this: see bug #398313."
+ fi
}
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] dev/blueness:master commit in: app-backup/spideroak-bin/files/, app-backup/spideroak-bin/
@ 2012-01-26 21:43 Anthony G. Basile
0 siblings, 0 replies; 4+ messages in thread
From: Anthony G. Basile @ 2012-01-26 21:43 UTC (permalink / raw
To: gentoo-commits
commit: 6da067e21c599489d9366e9363b3ce4a8c08b0ff
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 26 21:43:37 2012 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Jan 26 21:43:37 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=6da067e2
app-backup/spideroak-bin: moved to tree
---
app-backup/spideroak-bin/Manifest | 16 --
app-backup/spideroak-bin/files/headless.patch | 9 -
app-backup/spideroak-bin/files/opt-path.patch | 12 --
app-backup/spideroak-bin/metadata.xml | 22 ---
.../spideroak-bin/spideroak-bin-4.2.9913.ebuild | 154 --------------------
5 files changed, 0 insertions(+), 213 deletions(-)
diff --git a/app-backup/spideroak-bin/Manifest b/app-backup/spideroak-bin/Manifest
deleted file mode 100644
index 275975f..0000000
--- a/app-backup/spideroak-bin/Manifest
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX headless.patch 382 RMD160 e89c61b7eb0a54f844f760a68dc22c83083a4e0d SHA1 7271007194cc6d67b909e6633b495f6b4442d66d SHA256 a3869eec6d9837613bddfa3a3bdde8737bbb5b3c47fede28c2de7e412e5a56f4
-AUX opt-path.patch 451 RMD160 d5d3494d6cfdfce1a1dc61bc239d1990fabe78b0 SHA1 842d8ff4c83078e21ce2e7f8525f45da9423ce70 SHA256 a0ad54882ef97b75e74e1dcbe5684014f2b19b630a933bb8138286c8929e3576
-DIST spideroak-bin-4.2.9913_amd64.deb 24566640 RMD160 2ce797732ca6e157c7a2e93cede44cc18aec6fd8 SHA1 141de5c7fa4b17c9cc2fd074336a80f00da649b7 SHA256 4d0491e8b52503fa4cd5cf38cf235a946c9b9d28e1b01c5d2f02c2cdb97a6bff
-DIST spideroak-bin-4.2.9913_x86.deb 23969878 RMD160 c083bb88033eda8600b190e57f063c94cf1e48b5 SHA1 1d9a2d3450a8ec737740c3a4308082679bf5479d SHA256 0e460c1d89c9284201b6537dcee5ae4078de422f5f426202ca24f28b59bd1a61
-EBUILD spideroak-bin-4.2.9913.ebuild 4207 RMD160 83e80774b4e153275cd02d4a23cd596a4440a1c8 SHA1 da4606d8b47c9a5a474970ee273d0f4a82fe9b4d SHA256 6caee89c734e37c27ae79822dab5a0c158c7119fa73230328e506385090bda46
-MISC metadata.xml 649 RMD160 f0b82c20c49447d5428ad8cf3835b25707945454 SHA1 db1eb9f96b460029722495d7e12d2149b46837a1 SHA256 a11de661a97aa295ba5fe4597118cf559b4b794f5438f1d1d9670a6067b777fb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEAREIAAYFAk8bXLwACgkQl5yvQNBFVTUwYACeNji5nygxPLVOVEz8y5ytIcQE
-qJ8AoJ3belrqIYTOK6WyweNyBBqbYACO
-=6iUp
------END PGP SIGNATURE-----
diff --git a/app-backup/spideroak-bin/files/headless.patch b/app-backup/spideroak-bin/files/headless.patch
deleted file mode 100644
index e1b6c46..0000000
--- a/app-backup/spideroak-bin/files/headless.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -Naur usr/bin/SpiderOak usr/bin/SpiderOak
---- usr/bin/SpiderOak 2012-01-21 19:32:02.000000000 -0500
-+++ usr/bin/SpiderOak 2012-01-21 19:32:57.000000000 -0500
-@@ -3,4 +3,4 @@
- LD_LIBRARY_PATH="/opt/SpiderOak:$LD_LIBRARY_PATH"
- export LD_LIBRARY_PATH
- QT_PLUGIN_PATH= ; export QT_PLUGIN_PATH
--exec "/opt/SpiderOak/SpiderOak" "$@"
-+exec "/opt/SpiderOak/SpiderOak" --headless "$@"
diff --git a/app-backup/spideroak-bin/files/opt-path.patch b/app-backup/spideroak-bin/files/opt-path.patch
deleted file mode 100644
index adee3e1..0000000
--- a/app-backup/spideroak-bin/files/opt-path.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur a/usr/bin/SpiderOak b/usr/bin/SpiderOak
---- a/usr/bin/SpiderOak 2011-12-26 16:27:35.000000000 -0500
-+++ b/usr/bin/SpiderOak 2012-01-09 10:04:03.000000000 -0500
-@@ -1,6 +1,6 @@
- #!/bin/sh
-
--LD_LIBRARY_PATH="/usr/lib/SpiderOak:$LD_LIBRARY_PATH"
-+LD_LIBRARY_PATH="/opt/SpiderOak:$LD_LIBRARY_PATH"
- export LD_LIBRARY_PATH
- QT_PLUGIN_PATH= ; export QT_PLUGIN_PATH
--exec "/usr/lib/SpiderOak/SpiderOak" "$@"
-+exec "/opt/SpiderOak/SpiderOak" "$@"
diff --git a/app-backup/spideroak-bin/metadata.xml b/app-backup/spideroak-bin/metadata.xml
deleted file mode 100644
index 15f715e..0000000
--- a/app-backup/spideroak-bin/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer>
- <email>devurandom@gmx.net</email>
- <name>Dennis Schridde</name>
- <description>Maintainer.</description>
-</maintainer>
-<maintainer>
- <email>naota@gentoo.org</email>
- <name>Naohiro Aota</name>
- <description>Proxy maintainer.</description>
-</maintainer>
-<maintainer>
- <email>blueness@gentoo.org</email>
- <name>Anthony G. Basile</name>
-</maintainer>
-<use>
- <flag name='headless'>Build without graphic frontend</flag>
- <flag name='system-libs'>Remove bundled libs and use system libs</flag>
-</use>
-</pkgmetadata>
diff --git a/app-backup/spideroak-bin/spideroak-bin-4.2.9913.ebuild b/app-backup/spideroak-bin/spideroak-bin-4.2.9913.ebuild
deleted file mode 100644
index 129f2ef..0000000
--- a/app-backup/spideroak-bin/spideroak-bin-4.2.9913.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/spideroak-bin/spideroak-bin-4.2.9907.ebuild,v 1.1 2011/12/10 00:34:07 naota Exp $
-
-EAPI="4"
-
-inherit eutils versionator
-
-REV=$(get_version_component_range 3)
-SRC_URI_BASE="https://spideroak.com/directdownload?platform=ubuntulucid"
-
-DESCRIPTION="An easy, secure and consolidated free online backup, storage, access and sharing system."
-HOMEPAGE="https://spideroak.com"
-SRC_URI="x86? ( ${SRC_URI_BASE}&arch=i386&revision=${REV} -> ${P}_x86.deb )
- amd64? ( ${SRC_URI_BASE}&arch=x86_64&revision=${REV} -> ${P}_amd64.deb )"
-RESTRICT="mirror strip"
-
-LICENSE="spideroak"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbus headless system-libs"
-
-SSL_SLOT="0.9.8"
-
-DEPEND=""
-RDEPEND="
- dbus? ( sys-apps/dbus )
- !headless? (
- media-libs/fontconfig
- media-libs/freetype:2
- dev-libs/glib:2
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXmu
- x11-libs/libXrender
- x11-libs/libXt
- )
- system-libs? (
- dev-libs/openssl:$SSL_SLOT
- net-misc/curl
- >=sys-devel/gcc-4
- dev-libs/glib:2
- dev-libs/libpcre
- media-libs/libpng:1.2
- x11-libs/qt-core
- x11-libs/qt-gui
- dev-db/sqlite:3
- net-libs/libssh2
- sys-libs/zlib
- dev-lang/python:2.7
- dev-python/pycurl
- )
-"
-
-S=${WORKDIR}
-
-QA_PREBUILT="*"
-
-src_unpack() {
- unpack ${A}
- unpack ./data.tar.gz
- rm -f control.tar.gz data.tar.gz debian-binary
- rm -f usr/share/doc/spideroak/copyright
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/opt-path.patch
- use headless && epatch "${FILESDIR}"/headless.patch
-
- # Remove bundled libraries/plugins/python interpreter. Please keep this
- # mapping in sync with the RDEPEND system-libs? ( atoms ) above, and the
- # list of deleted files below
- #
- # libcrypto.so.0.$SSL_SLOT => dev-libs/openssl:$SSL_SLOT
- # libssl.so.$SSL_SLOT => dev-libs/openssl:$SSL_SLOT
- # libcurl.so* => net-misc/curl
- # libexpat.so* => dev-libs/expat
- # libgcc_s.so => >=sys-devel/gcc-4
- # libstdc++.so* => >=sys-devel/gcc-4
- # libpcre.so* => dev-libs/libpcre
- # libpng12* => media-libs/libpng:1.2
- # libQt*.so* => x11-libs/qt-core x11-libs/qt-gui
- # libsqlite3.so* => dev-db/sqlite:3
- # libssh2.so* => net-libs/libssh2
- # libz.so* => sys-libs/zlib
- #
- # pycurl.so pyexpat.so => dev-python/pycurl
- #
- # usr/lib/SpiderOak/py => dev-lang/python:2.7
- #
- if use system-libs; then
- for lib in \
- libcrypto.so.$SSL_SLOT \
- libssl.so.$SSL_SLOT \
- libcurl.so* \
- libexpat.so* \
- libgcc_s.so* \
- libpcre.so* \
- libpng12* \
- libQt*.so* \
- libsqlite3.so* \
- libssh2.so* \
- libstdc++.so* \
- libz.so* \
- pycurl.so \
- pyexpat.so
- do
- rm usr/lib/SpiderOak/$lib || die "rm $lib failed"
- done
-
- # Remove bundled python interpreter => dev-lang/python:2.7
- rm usr/lib/SpiderOak/py || die "rm py failed"
- fi
-}
-
-src_install() {
- #install the executable script
- exeinto /usr/bin
- doexe usr/bin/SpiderOak
-
- #install the prebundled libraries
- dodir /opt
- cp -pPR usr/lib/SpiderOak "${ED}"/opt/
-
- #install the config files
- rm -rf etc/apt
- use dbus || rm -rf etc/dbus-1
- insinto /
- doins -r etc
-
- #install the changelog
- insinto /usr/share/doc/${P}
- doins usr/share/doc/spideroak/changelog.gz
-
- if ! use headless ; then
- domenu usr/share/applications/spideroak.desktop
- doicon usr/share/pixmaps/spideroak.png
- fi
-}
-
-pkg_postinst() {
- if use headless; then
- einfo "For instructions on running SpiderOak without a GUI, please read the FAQ:"
- einfo " https://spideroak.com/faq/questions/62/how_do_i_install_spideroak_on_a_headless_linux_server/"
- einfo " https://spideroak.com/faq/questions/67/how_can_i_use_spideroak_from_the_commandline/"
- fi
- if use system-libs; then
- einfo "You have chosen to use your system libraries rather than the libraries that SpiderOak"
- einfo "bundles with their software. The advantage to doing so is that it reduce the size of"
- einfo "the package on your hard drive. However, upstream discourages this: see bug #398313."
- fi
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-01-26 21:43 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-10 15:44 [gentoo-commits] dev/blueness:master commit in: app-backup/spideroak-bin/files/, app-backup/spideroak-bin/ Anthony G. Basile
-- strict thread matches above, loose matches on Subject: below --
2012-01-10 16:21 Anthony G. Basile
2012-01-22 0:39 Anthony G. Basile
2012-01-26 21:43 Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox