Bump to version 31.0.5

5 files changed, 19 insertions, 77 deletions

diff --git a/app-pda/sogo-connector/Manifest b/app-pda/sogo-connector/Manifest
index e690257..fad8a12 100644
--- a/app-pda/sogo-connector/Manifest
+++ b/app-pda/sogo-connector/Manifest
@@ -1,6 +1,4 @@
-AUX makefile.patch 710 SHA256 963eb156004265e92e2f0d52398b4a335e448e1729f512f28582717118f368d0 SHA512 e6799e54bef3fe57f7920e5682119d3d45bd393c4dd2acd09bf4d874fb410864cf377c5fc3a67844b990c217ca50b33b44c81223562c3a33d00d7775c11d62bb WHIRLPOOL bea4972950ca1a74093c85a93f5db6d243d508182b7f8064677420c7402d66cfc6c6bea39b32e34695c940157215ceac08dafc8a5a44d53dfca257cc61ed345f
-AUX sogo-connector-24.0.6-makefile.patch 979 SHA256 16b8b65cce99d05c3de1a7a3e6d0c694d85d7ee75a11a4734c0d6b383ceeba38 SHA512 9e08f2e4641f82ca406e9ef13e958f462f09a32fc2a8f5b97f50cdbb3e3d7cb9dcc3b7dccc45b80caf6753ffed7a4aa02fdd48287810d56e39bee7b44d5bb8c7 WHIRLPOOL 9061298c6f3cf599706ce7d45df98b837dc552acc2db05163f5827a6ded4efe8f35ee2bd72a3fbcddda808921dde24fb16853055ad48f54e0062d0259daf1466
-DIST sogo-connector-31.0.2.zip 294316 SHA256 da45c22bdb36eb9188f983b71b4f8c23e0ad2a82b10f1fa22fa7ed0aecc66706 SHA512 22efecde020e640ae52a255c0d870b9c7f8644da1daa4bab1f61cf139d983ca1c32d021f5a9626d45b30c9a01ad20dbc3576a4b19a34ffde5ea7b7c61df00d70 WHIRLPOOL 3e28d7737941f298ea1ec028354617071d96de5f4cf2eb2710606e5c242250b74d40de0df857c3c78d25f93e6b4aacadfea36600e67b1ce5e339ac5d98b1b1df
-DIST sogo-connector-31.0.4.tar.gz 167312 SHA256 e908cb8c80a3bf2a6fc71101056529c06169a2ce537c3332974640155bf326d7 SHA512 9de9b6640627ecc48820a50d58a702eeab254dd9458619c1078b9b565bf49a24d839a5a192e1ff2fbcf765492603581bb1a0dcf692cd4fd105c1027ed868c98c WHIRLPOOL 5a4719353db793a5e3ed19a95152574dcffa1b86bf6984c17a49c7cca3a2bf7a93f30b9d87d2a12c2361e4e5700fa09801b583c75ffc6d6940fe4c999bd3a891
-EBUILD sogo-connector-31.0.2.ebuild 989 SHA256 73ea05f45f1bd49529b070aabced428d863ce18a42fc4de8843b34aa0c148500 SHA512 105a25693e44e72bc2c783e9a948acf688e4be8981c70b9daf33f05e44201840d94643296eaef1dee9b99614bf00a0171398158a9a0267c5fc193d38925ba368 WHIRLPOOL ec3c76f377946de465c71af1eb552d003c86023e3c173c302da20984afa63ef2e5e4af39304d3ed1c3518b04dfedf5cbfd14adfbb1a4a9e60341ce95f668832a
-EBUILD sogo-connector-31.0.4.ebuild 1137 SHA256 c56d6ccada664a1c5ab2c851c94c39d87183d1c399c8fec1232c5ec3087b4fc7 SHA512 a61f76a3adf1f5de8cbc03d8ed15009924b453f145dfcac122388d89fd048366d69ef4d28fc53d589cf97d14969f9cc5714190a279dec93841a1df5e95d03fcd WHIRLPOOL 91f238fab9264c1b3e48170f69dd7da4f91d7d2ea1e41ae4ccf51fa9587590f6dd1a006f63c1862da7b149436dc48f5f2f51a553818b5a3f569c84295f149989
+AUX 31.0.5-fix-version.patch 643 BLAKE2B 7c42146fffa80efb968ca8b9e3ba013fe6ff38d2beeafd94b200e5098240b1ada049167658a7e93858be1daab8edfc13597d4fa0c1d6422ed1907fc413e3a75c SHA512 65373ff11852461495277d0586f87cdb403c0d913ef9467001b67928e161ee9d0737d1ee97afe3e218c30e3304f36e36597eca6e23d9dd8084d462d12c6002b3
+AUX makefile.patch 710 BLAKE2B 5e1b66e4570c508160fc32bb9d417c3a70c83d505ca9e3797c5320f6aff0b67ea7ac225af0bbfb25538cee45829bef20e1d221bfe90b87d477a9e0a57c0ff267 SHA512 e6799e54bef3fe57f7920e5682119d3d45bd393c4dd2acd09bf4d874fb410864cf377c5fc3a67844b990c217ca50b33b44c81223562c3a33d00d7775c11d62bb
+DIST sogo-connector-31.0.5.tar.gz 167269 BLAKE2B dd9949e7274a0327a6087b9507a22906ba6bb884cf1167c484d6f488f00fba774881004e36a338eedccdb07e72935c438e7638b471e6d7ec25c7559a81e4be44 SHA512 2423257f9218f1d471a1e76168d15a04e81d4e699f617fa10a14cf350570b1cbed397286864647a22313ad6c90bccc87422410c1c55514b6217d5d4f343cbfdf
+EBUILD sogo-connector-31.0.5.ebuild 1042 BLAKE2B dac942264585edb8cfc58e424960bad67a670496ebeb07527f7808c5722cca00db5a74b454e172e926f9b08adf9725908a5ffd7e440bf62c49910b538fac69d7 SHA512 5a780ed0338b2edfa566a07b740866908f6cb5de6003048432d965a36ba2209f977a957d9c0969d6a9504f83aced422bd6fe822e532bc0993d9410d011b61c59
diff --git a/app-pda/sogo-connector/files/31.0.5-fix-version.patch b/app-pda/sogo-connector/files/31.0.5-fix-version.patch
new file mode 100644
index 0000000..28c6c6f
--- /dev/null
+++ b/app-pda/sogo-connector/files/31.0.5-fix-version.patch
@@ -0,0 +1,13 @@
+Index: sogo-connector.tb31-sogo-connector-31.0.5/install.rdf
+===================================================================
+--- sogo-connector.tb31-sogo-connector-31.0.5.orig/install.rdf
++++ sogo-connector.tb31-sogo-connector-31.0.5/install.rdf
+@@ -5,7 +5,7 @@
+   <Description about="urn:mozilla:install-manifest"
+     em:name="Inverse SOGo Connector"
+     em:id="sogo-connector@inverse.ca"
+-    em:version="31.0.4"
++    em:version="31.0.5"
+     em:description="A DAV plugin for keeping addressbooks and events in sync"
+     em:iconURL="chrome://sogo-connector/skin/addressbook/sogo.png"
+     em:creator="Inverse &lt;support@inverse.ca>"
diff --git a/app-pda/sogo-connector/files/sogo-connector-24.0.6-makefile.patch b/app-pda/sogo-connector/files/sogo-connector-24.0.6-makefile.patch
deleted file mode 100644
index a0f3548..0000000
--- a/app-pda/sogo-connector/files/sogo-connector-24.0.6-makefile.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: sogo-connector.tb24-sogo-connector-24.0.6/Makefile
-===================================================================
---- sogo-connector.tb24-sogo-connector-24.0.6.orig/Makefile
-+++ sogo-connector.tb24-sogo-connector-24.0.6/Makefile
-@@ -1,5 +1,4 @@
- PACKAGE = sogo-connector
--GIT_REV = $(shell git rev-parse --verify HEAD | cut -c1-10)
- 
- ifeq ($(shell uname),Darwin)
- VERSION = $(shell grep em:version install.rdf | sed -E 's@(em:version=|"| )@@g')
-@@ -7,7 +6,7 @@ else
- VERSION = $(shell grep em:version install.rdf | sed -e 's@\(em:version=\|\"\|\ \)@@g')
- endif
- 
--XPI_ARCHIVE = $(PACKAGE)-$(VERSION)-$(GIT_REV).xpi
-+XPI_ARCHIVE = $(PACKAGE)-$(VERSION).xpi
- 
- SHELL = /bin/bash
- ZIP = /usr/bin/zip
-@@ -42,8 +41,8 @@ MANIFEST-pre:
- 	@find . -type f -name "*.properties" >> $@	
- 	@find . -type f -name "RELEASE-NOTES" >> $@	
- 
--rest:
--	@make $(XPI_ARCHIVE)
-+rest: MANIFEST
-+	@+$(MAKE) $(XPI_ARCHIVE)
- 
- $(XPI_ARCHIVE): $(FILENAMES)
- 	@echo Generating $(XPI_ARCHIVE)...
diff --git a/app-pda/sogo-connector/sogo-connector-31.0.2.ebuild b/app-pda/sogo-connector/sogo-connector-31.0.2.ebuild
deleted file mode 100644
index a02382b..0000000
--- a/app-pda/sogo-connector/sogo-connector-31.0.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils versionator
-
-DESCRIPTION="CardDAV plugin for mail-client/thunderbird"
-HOMEPAGE="http://www.sogo.nu/downloads/frontends.html"
-THUNDERBIRD_VERSION="$(get_major_version )"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-SRC_URI="https://github.com/inverse-inc/${PN}.tb${THUNDERBIRD_VERSION}/archive/${P}.zip"
-
-RDEPEND="|| ( =mail-client/thunderbird-31*[lightning] =mail-client/thunderbird-38*[lightning] )"
-
-DEPEND="${RDEPEND}"
-S="${WORKDIR}/${PN}.tb${THUNDERBIRD_VERSION}-${P}"
-
-src_prepare() {
-        epatch "${FILESDIR}/makefile.patch"
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/thunderbird"
-
-	emid=$(sed -n '/em:id=/!d; s/\s*em:id="//; s/"\s*//; p; q' install.rdf)
-
-	dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} || die
-	cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die
-	unzip "${S}/${P}.xpi" || die
-}
diff --git a/app-pda/sogo-connector/sogo-connector-31.0.4.ebuild b/app-pda/sogo-connector/sogo-connector-31.0.5.ebuild
index 69309cd..f67e837 100644
--- a/app-pda/sogo-connector/sogo-connector-31.0.4.ebuild
+++ b/app-pda/sogo-connector/sogo-connector-31.0.5.ebuild
@@ -15,8 +15,6 @@ SLOT="0"
 LICENSE="GPL-2"
 IUSE=""
 
-#EGIT_REPO_URI="https://github.com/inverse-inc/sogo-connector.tb31.git"
-#EGIT_COMMIT="0b0959bd023c5e19784948c82bdc0c0db95c94b5"
 SRC_URI="https://github.com/inverse-inc/${PN}.tb${THUNDERBIRD_VERSION}/archive/${P}.tar.gz"
 
 RDEPEND="|| ( =mail-client/thunderbird-45*[lightning] =mail-client/thunderbird-52*[lightning] )"
@@ -26,6 +24,7 @@ S="${WORKDIR}/${PN}.tb${THUNDERBIRD_VERSION}-${P}"
 
 src_prepare() {
         epatch "${FILESDIR}/makefile.patch"
+	epatch "${FILESDIR}/31.0.5-fix-version.patch"
 	default
 }
 
@@ -35,6 +34,5 @@ src_install() {
 	emid=$(sed -n '/em:id=/!d; s/\s*em:id="//; s/"\s*//; p; q' install.rdf)
 
 	dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} || die
-	cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die
-	unzip "${S}/${P}.xpi" || die
+	unzip "${P}.xpi" -d "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}|| die
 }