7 files changed, 10 insertions, 122 deletions
diff --git a/app-pda/sogo-connector/Manifest b/app-pda/sogo-connector/Manifest
index b6dc253..3815b79 100644
--- a/app-pda/sogo-connector/Manifest
+++ b/app-pda/sogo-connector/Manifest
@@ -1,9 +1,3 @@
-AUX 31.0.5-fix-version.patch 643 BLAKE2B 7c42146fffa80efb968ca8b9e3ba013fe6ff38d2beeafd94b200e5098240b1ada049167658a7e93858be1daab8edfc13597d4fa0c1d6422ed1907fc413e3a75c SHA512 65373ff11852461495277d0586f87cdb403c0d913ef9467001b67928e161ee9d0737d1ee97afe3e218c30e3304f36e36597eca6e23d9dd8084d462d12c6002b3
-AUX makefile.patch 710 BLAKE2B 5e1b66e4570c508160fc32bb9d417c3a70c83d505ca9e3797c5320f6aff0b67ea7ac225af0bbfb25538cee45829bef20e1d221bfe90b87d477a9e0a57c0ff267 SHA512 e6799e54bef3fe57f7920e5682119d3d45bd393c4dd2acd09bf4d874fb410864cf377c5fc3a67844b990c217ca50b33b44c81223562c3a33d00d7775c11d62bb
-AUX sogo-connector-68.0.0-makefile.patch 684 BLAKE2B fdf1316870a2593d2064938dac212cceb2f29f62aea249db581e052bc8a658a72a8b211b956d86848e3c5ce97d1467140d4ccd19c886c4238312c72ff2045e5f SHA512 eb3a038d8a538f9d6d04938e3d27142574066703ebde405986d5c43c5f2e8d40fe9d9a707ad77ddd50b9290ca9077f70c3efd13514dec22a2a3d01d019453701
-DIST sogo-connector-60.0.0.tar.gz 170906 BLAKE2B 25b53fcdc4dc0981f2d12601c0e12a0392425d65a767e2d90c276fb92abb9682ce5acfd0ec160fca3e64372cae61637d89d30f8aae9e36f42e22cfc7db3e9f69 SHA512 0d94468d6db7e90cc18b0179d98f159e22f4b2bfa63b3377c19bdf90be288074ef1a51663575981eddeba71e0724a5d422529395daf9449c5d8186558eff757c
-DIST sogo-connector-68.0.0.tar.gz 249488 BLAKE2B d3504d5d3d3fd2e5bab5e08ca3557d2152e0aa2a658ef2f943d923f176ac83338db2b7a40f670b2df985ce61da69fea7aaf9fb8b791853fa06e1d83c6e7b0bfa SHA512 a222b99505c6096a9025f18cc721e19a4ecb7f69446bd5bfbd7199b976a35c8282d4c6f2d6af99bb921af5b94d6a4a73ac5b103169240e6b039e26abfc44b92b
+AUX makefile.patch 684 BLAKE2B 76d402eb2ea6bfe639a971e1da3c1f73e0a88d13ea326a00abab8018b2a814d60c4688d76f732862d57bb574803f0e997994694fb68aedf33edfd3fb75e8f761 SHA512 5b4b48bfd674893b8e89ccb4b210f41794575c394d86c6965c5f64b0932a65563c848907ddedf410959c21d96b761f7232d69c45dffe3fdfe80babbdcc874681
 DIST sogo-connector-68.0.1.tar.gz 252727 BLAKE2B 25475a854b08fa31d5d2481b512a4dc893b4d9587367f600fd45bef48f299abf24311fbd86941832150ec88fa835f3bb27531da5215594979d2ae9a89ac71c73 SHA512 a53bc9c70c364aa70ab7e1568767f1a09a70c7e66cfe746e8a85c50133deb817921e5aea0f5881c07ec4e58f8f0f5bc1692c5e1c38b2e604ab140b68474d5f04
-EBUILD sogo-connector-60.0.0.ebuild 897 BLAKE2B 31efae9ed4f43d6957828e8972d36027f89b8fa447d74e3864b8e4b15ae5777bcc938daa55ade83b8774b8f49fa9ef37aa6d144fbf8d9eb5677862b19ab35989 SHA512 f5f300d09e9abfeb4e4af103e6255550f4e7b9f719f41b38d7ef40769c9ccfc1c70e039f52ea318270766ccffb03a3f930d187d539c0c2f6b9e4141fa1f58076
-EBUILD sogo-connector-68.0.0.ebuild 902 BLAKE2B dc2cc19a5dca11b249d560f0479b01fd36f23833105f131bafe118f530f85f01530d4f66b246edf5ca3ff7cf4edabbaf01bfe83cad7bc8dcfc9cfa14018d34e5 SHA512 371170e2b4ce4fface76622bae84db7dd98a136d4ba50639500bb5e5c3293d1d5309b79e82d5de4678b1de6e073551329a96059d7d8a2eee4027bd0afec2436f
-EBUILD sogo-connector-68.0.1.ebuild 902 BLAKE2B dc2cc19a5dca11b249d560f0479b01fd36f23833105f131bafe118f530f85f01530d4f66b246edf5ca3ff7cf4edabbaf01bfe83cad7bc8dcfc9cfa14018d34e5 SHA512 371170e2b4ce4fface76622bae84db7dd98a136d4ba50639500bb5e5c3293d1d5309b79e82d5de4678b1de6e073551329a96059d7d8a2eee4027bd0afec2436f
+EBUILD sogo-connector-68.0.1.ebuild 897 BLAKE2B 4c34e79402ba79246b1b8611984ef3c94e0a144e99fbed3f2ee3557c18fc11653be3e2ceb92096babd171e1d9c4f4875b51b356ababfdfe687f191a7dbfad308 SHA512 0250074c5a9016c240aa55fb806270d3e35345c7cc904b1cde19b0645527e9fd973e6e7d1f471f24a12d221614b9675f015793e0a36ea2364edf341d1eebb0a0
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
deleted file mode 100644
index 28c6c6f..0000000
--- a/app-pda/sogo-connector/files/31.0.5-fix-version.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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/makefile.patch b/app-pda/sogo-connector/files/makefile.patch
index 3311428..e6ba578 100644
--- a/app-pda/sogo-connector/files/makefile.patch
+++ b/app-pda/sogo-connector/files/makefile.patch
@@ -1,19 +1,19 @@
-Index: sogo-connector.tb31-sogo-connector-31.0.0/Makefile
+Index: work/sogo-connector-sogo-connector-68.0.1/Makefile
 ===================================================================
---- sogo-connector.tb31-sogo-connector-31.0.0.orig/Makefile
-+++ sogo-connector.tb31-sogo-connector-31.0.0/Makefile
+--- work.orig/sogo-connector-sogo-connector-68.0.1/Makefile
++++ work/sogo-connector-sogo-connector-68.0.1/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')
+@@ -8,7 +7,7 @@ VERSION = $(shell grep em:version instal
  endif
  
+ FIND_FILTER = ! -path './custom/*' -type f
 -XPI_ARCHIVE = $(PACKAGE)-$(VERSION)-$(GIT_REV).xpi
 +XPI_ARCHIVE = $(PACKAGE)-$(VERSION).xpi
  
- SHELL = /bin/bash
- ZIP = /usr/bin/zip
+ SHELL=bash
+ ZIP=zip
diff --git a/app-pda/sogo-connector/files/sogo-connector-68.0.0-makefile.patch b/app-pda/sogo-connector/files/sogo-connector-68.0.0-makefile.patch
deleted file mode 100644
index 0d0055e..0000000
--- a/app-pda/sogo-connector/files/sogo-connector-68.0.0-makefile.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: work/sogo-connector-sogo-connector-68.0.0/Makefile
-===================================================================
---- work.orig/sogo-connector-sogo-connector-68.0.0/Makefile
-+++ work/sogo-connector-sogo-connector-68.0.0/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')
-@@ -8,7 +7,7 @@ VERSION = $(shell grep em:version instal
- endif
- 
- FIND_FILTER = ! -path './custom/*' -type f
--XPI_ARCHIVE = $(PACKAGE)-$(VERSION)-$(GIT_REV).xpi
-+XPI_ARCHIVE = $(PACKAGE)-$(VERSION).xpi
- 
- SHELL=bash
- ZIP=zip
diff --git a/app-pda/sogo-connector/sogo-connector-60.0.0.ebuild b/app-pda/sogo-connector/sogo-connector-60.0.0.ebuild
deleted file mode 100644
index 8264d85..0000000
--- a/app-pda/sogo-connector/sogo-connector-60.0.0.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=6
-
-inherit eutils versionator #git-r3
-
-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}/archive/${P}.tar.gz"
-
-RDEPEND="=mail-client/thunderbird-60*[lightning]"
-
-DEPEND="${RDEPEND}"
-S="${WORKDIR}/${PN}-${P}"
-
-src_prepare() {
-        epatch "${FILESDIR}/makefile.patch"
-	default
-}
-
-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
-	unzip "${P}.xpi" -d "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}|| die
-}
diff --git a/app-pda/sogo-connector/sogo-connector-68.0.0.ebuild b/app-pda/sogo-connector/sogo-connector-68.0.0.ebuild
deleted file mode 100644
index ddca549..0000000
--- a/app-pda/sogo-connector/sogo-connector-68.0.0.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=6
-
-inherit eutils versionator #git-r3
-
-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}/archive/${P}.tar.gz"
-
-RDEPEND="=mail-client/thunderbird-68*[lightning]"
-
-DEPEND="${RDEPEND}"
-S="${WORKDIR}/${PN}-${P}"
-
-src_prepare() {
-        epatch "${FILESDIR}/${P}-makefile.patch"
-	default
-}
-
-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
-	unzip "${P}.xpi" -d "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}|| die
-}
diff --git a/app-pda/sogo-connector/sogo-connector-68.0.1.ebuild b/app-pda/sogo-connector/sogo-connector-68.0.1.ebuild
index ddca549..443edbe 100644
--- a/app-pda/sogo-connector/sogo-connector-68.0.1.ebuild
+++ b/app-pda/sogo-connector/sogo-connector-68.0.1.ebuild
@@ -23,7 +23,7 @@ DEPEND="${RDEPEND}"
 S="${WORKDIR}/${PN}-${P}"
 
 src_prepare() {
-        epatch "${FILESDIR}/${P}-makefile.patch"
+        epatch "${FILESDIR}/makefile.patch"
 	default
 }