From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RkeSO-0003yD-VO for garchives@archives.gentoo.org; Tue, 10 Jan 2012 16:21:55 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2E62E21C01F; Tue, 10 Jan 2012 16:21:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D50A221C01F for ; Tue, 10 Jan 2012 16:21:42 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0DEAB1B402C for ; Tue, 10 Jan 2012 16:21:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 7BEF580044 for ; Tue, 10 Jan 2012 16:21:41 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: Subject: [gentoo-commits] dev/blueness:master commit in: app-backup/spideroak-bin/files/, app-backup/spideroak-bin/ X-VCS-Repository: dev/blueness X-VCS-Files: app-backup/spideroak-bin/Manifest app-backup/spideroak-bin/files/opt-path.patch app-backup/spideroak-bin/metadata.xml app-backup/spideroak-bin/spideroak-bin-4.2.9913.ebuild X-VCS-Directories: app-backup/spideroak-bin/files/ app-backup/spideroak-bin/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: d7c2cfab5ca6688d3a41459e66671af6fc2daa69 Date: Tue, 10 Jan 2012 16:21:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: bb6bc607-47ba-4602-b69f-52ac3f918570 X-Archives-Hash: 2bf6827f534be69de6cb41cc7d7a7872 commit: d7c2cfab5ca6688d3a41459e66671af6fc2daa69 Author: Anthony G. Basile gentoo org> AuthorDate: Tue Jan 10 16:21:36 2012 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Tue Jan 10 16:21:36 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/blueness.git;a= =3Dcommit;h=3Dd7c2cfab 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 S= HA1 842d8ff4c83078e21ce2e7f8525f45da9423ce70 SHA256 a0ad54882ef97b75e74e1= dcbe5684014f2b19b630a933bb8138286c8929e3576 DIST spideroak-bin-4.2.9913_amd64.deb 24566640 RMD160 2ce797732ca6e157c7= a2e93cede44cc18aec6fd8 SHA1 141de5c7fa4b17c9cc2fd074336a80f00da649b7 SHA2= 56 4d0491e8b52503fa4cd5cf38cf235a946c9b9d28e1b01c5d2f02c2cdb97a6bff DIST spideroak-bin-4.2.9913_x86.deb 23969878 RMD160 c083bb88033eda8600b1= 90e57f063c94cf1e48b5 SHA1 1d9a2d3450a8ec737740c3a4308082679bf5479d SHA256= 0e460c1d89c9284201b6537dcee5ae4078de422f5f426202ca24f28b59bd1a61 -EBUILD spideroak-bin-4.2.9913.ebuild 3041 RMD160 1ac5b2d8d8a7240e76fab34= 468c13f27c4adc57b SHA1 7339a34504dc76e0167a4f1bf64672a9e201c096 SHA256 01= b1036fd086fae06c0b5adee30f1cdc6f41317025b84af1a513d9cc877a9fa0 -MISC metadata.xml 690 RMD160 10e629b3e5bf0bfdd55aa1df775ddefb8cb915bd SH= A1 72b64b4f98e4731e527468c601d37e1468c4b02a SHA256 d756681b36f4120db893d1= 3daa563f01fd3bd62694f53c86a24d7c2d9a31123d +EBUILD spideroak-bin-4.2.9913.ebuild 2188 RMD160 3b5e9f33d494d90d9106a25= eceeb65ef4543883b SHA1 8a93c34302cb1d65c9980ad5a725dcf174584bfa SHA256 13= e45e454254c48e884989017ed660f55903c4c1c1a9ae88c9f0cd3075e42798 +MISC metadata.xml 575 RMD160 530b6644aec999259cedef14983ff0e91767121c SH= A1 daa48e245d77a1e0f33ed73750156554fd48a1cf SHA256 8468a02850b2a6e0bff2b6= 03d67ba2ddd59c92ca4d04f8cf9bfb79b88e5b5b31 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iEYEAREIAAYFAk8MZZAACgkQl5yvQNBFVTVEjgCcCSLXuPSLtSdv8jKr/IS2lz8d +KtgAn2sL+exLgVRFeHnyThkwOBMy4vWB +=3D3q4p +-----END PGP SIGNATURE----- diff --git a/app-backup/spideroak-bin/files/opt-path.patch b/app-backup/s= pideroak-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 =20 -LD_LIBRARY_PATH=3D"/usr/lib/SpiderOak:$LD_LIBRARY_PATH" -+LD_LIBRARY_PATH=3D"/opt/spideroak/usr/lib/SpiderOak:$LD_LIBRARY_PATH" ++LD_LIBRARY_PATH=3D"/opt/SpiderOak:$LD_LIBRARY_PATH" export LD_LIBRARY_PATH QT_PLUGIN_PATH=3D ; 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 @@ Build without graphic frontend - Use bundled pycurl - Use bundled Qt4 libraries 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} } =20 src_prepare() { @@ -54,27 +53,31 @@ src_prepare() { } =20 src_install() { - insinto /opt/${PN} - doins -r usr/lib/SpiderOak/* - + #install the executable script exeinto /usr/bin doexe usr/bin/SpiderOak =20 - #exeinto /opt/SpiderOak - #doexe usr/lib/SpiderOak/SpiderOak + #install the prebundled libraries + dodir /opt + cp -pPR usr/lib/SpiderOak "${ED}"/opt/ =20 - 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 =20 + #install the changelog insinto /usr/share/doc/${P} - doins usr/share/doc/${P}/changelog.gz + doins usr/share/doc/spideroak/changelog.gz =20 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 } =20 pkg_postinst() {