Version bump, wrt bug #507716. Drop old versions

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

6 files changed, 54 insertions, 113 deletions

diff --git a/mail-filter/dovecot_deleted_to_trash/ChangeLog b/mail-filter/dovecot_deleted_to_trash/ChangeLog
index a4475e13dac4..c18ac8ea2e29 100644
--- a/mail-filter/dovecot_deleted_to_trash/ChangeLog
+++ b/mail-filter/dovecot_deleted_to_trash/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-filter/dovecot_deleted_to_trash
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dovecot_deleted_to_trash/ChangeLog,v 1.11 2014/02/21 11:28:39 civil Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dovecot_deleted_to_trash/ChangeLog,v 1.12 2014/06/05 08:34:49 pinkbyte Exp $
+
+*dovecot_deleted_to_trash-0.6 (05 Jun 2014)
+
+  05 Jun 2014; Sergey Popov <pinkbyte@gentoo.org>
+  -dovecot_deleted_to_trash-0.3.ebuild, -dovecot_deleted_to_trash-0.5.ebuild,
+  +dovecot_deleted_to_trash-0.6.ebuild, -files/fix_names_and_destdir.patch:
+  Version bump, wrt bug #507716. Drop old versions
 
   21 Feb 2014; Vladimir Smirnov -dovecot_deleted_to_trash-0.5-r1.ebuild:
   Remove dovecot_deleted_to_trash-0.5-r1, was early added by proxy maintainer's
diff --git a/mail-filter/dovecot_deleted_to_trash/Manifest b/mail-filter/dovecot_deleted_to_trash/Manifest
index 23b40fb5c14f..c9d3e0e8c54e 100644
--- a/mail-filter/dovecot_deleted_to_trash/Manifest
+++ b/mail-filter/dovecot_deleted_to_trash/Manifest
@@ -2,21 +2,18 @@
 Hash: SHA256
 
 AUX 29-delete-to-trash.conf 289 SHA256 31e7d493e6b437b3b1847ec08b009208cd0707aa5bf0ed242c4baa4fffff2850 SHA512 3b1c7156128bddc99ec96576e9b97d0159fbb2034fd755bd9a60c1c2524d1727ce8a17a4967039f7c4bb267eb5bfbf65ceef4b3d4dcf3fef0a34178740ac9119 WHIRLPOOL 2e95b88a30d740a0f479d7bc9e43dc691d75527f1f1db2b7504e2f06bcbc2e1d3e4b9e459ace65205af5568add4c9bcc50b3127fe6768ac3e7de767f34739f70
-AUX fix_names_and_destdir.patch 586 SHA256 119de2d7797568398e14de0857e3dfbe24f2707870ef9d0c005bdaf773f7873f SHA512 d42528c5797c1de567fcfb9999cf8c489588ba36cd62a11db9d9d0e902dedc48a7db8fd09f8dadfbc41bda108b0e8e745e6437f6172f9d41d569d2b2e9112b54 WHIRLPOOL b347e592365e98d551d02c42c5de2bcea769f31444a111898df2f34c5809e9fe79fb439e0a16d7cb647b97fe0df7407600bc8525108daa696c88f67b0eeab712
-DIST dovecot_deleted_to_trash-0.3.tar 20480 SHA256 e434f49b0bdfb6cd042a36285fc7846a46b7f026a73356f1cdaa3d706fdc061b SHA512 a21e3d6fd6c09011dfc688fc21b03745e658184ff3ae0fb12a78334fcbfed91b8a51b7b50d0282ce43255e176b2b603e352794142b86ce7d726f098e068b7466 WHIRLPOOL ed15585345fe6f7ffcf3050620b61aaa899d3ea8d124fe7285041712b79ba29af3924d037460c35f389cb040ee326f3d7a1e438dc8e14161b069263ac5c5324c
-DIST dovecot_deleted_to_trash-0.5.tar.bz2 3539 SHA256 4c2b31d0d2e78e7045dfc50a8e9a6bdb2d2920bd7a2dd41a27e27cb163aba6c4 SHA512 8631c344e5c06691487b9c58b22a5f59220f385b1d1a88a8fc2a6bddba1fd98b30f7894a7262394e794eafd73238cbe8286ead31bde1756921af6aabfd1434b5 WHIRLPOOL d88223fb1d3590215513001d95383d52b7e6ded684681c534d56553b81369a20fbf4a05552122f54101d32338e39e84a0927efee3eaf31fe30bafbe5391fb11c
-EBUILD dovecot_deleted_to_trash-0.3.ebuild 1115 SHA256 d111234dfbd7e2565daaac3cc2aa496888774091352d42ce191bc9b737914a4d SHA512 ae282178accfaddce9f524d12e57af090f2626d01932059458a465648b3bb57c6b5755fd5b6aef3d6c7875291805bce7481683657b3ac933cfa8629c84c0ce80 WHIRLPOOL 3b82e2dbd526a1aa368d37c241d131c0498dce33226b2357310eb7fc568e71ec83941c5c40b8c1a821fb97d32f0849fe67993ca223e357556ce97e4740708b60
-EBUILD dovecot_deleted_to_trash-0.5.ebuild 941 SHA256 da93dd061ef82349082f085ec33f298926912a2c50829132e2c66d983c103df4 SHA512 94f01b20d8b0c71d768d6a74db34669517fbe0e249ba8171416ad1a88fa97b189a18f05bcfdb71d98d6f1810eee612726830382f989668a2b1addce77ccd038c WHIRLPOOL 659a46620e32929840aba5958ac0bba430db1e543716c95782edd4524d461c1a0bc9aabcda1e1e77de6a5181ec124c746ba29cd94dc228398ed1eefe16ad9627
-MISC ChangeLog 2179 SHA256 9755efae8b0fae93f8abdf18e1b97cbddd2bca023914ac7536eee9338f8560c9 SHA512 0c7faa7e9b694d49a3b501749ff744cdc5c4973492ef4844f184c20cea7df801216b18de6bb5b421bd222fea66a81e95813bf4fe6ed5499fb7b4cbe493169d7d WHIRLPOOL 29e82fc1246885f8a8924fa317d3c6e8f9ba5298344b192238e11012a8a655cd641a6ce3724abacc8b1d714e9d922a9264f9b94729f7ea8bcee95d4f32b1d444
+DIST dovecot_deleted_to_trash-0.6.tar.gz 4805 SHA256 68d128092a42ad1a0aecaf273a59aee22c9b23e9697203fd7e629ab327d638cb SHA512 41da1b622f30ee137ac8c06a687466a36c21035fd54b83393543c944b4e7cb4f3576556f220734d934033e6804d371eb5a1ec4f1d2491f3bf808782a59e2cb12 WHIRLPOOL 1c9e6e516b9f2c350a087aaf525c6e7f2d879fe240797a6f38b088a5c0bd4d8232592900a250b0e64486870a92d52c6badfabc2da5628d789923951108037b58
+EBUILD dovecot_deleted_to_trash-0.6.ebuild 978 SHA256 78f49c28eae94f27c0b6a38eae06dafb0de90b8428ce40972e337e0ad276403b SHA512 86f54e872e23a9caa4f33e50a6066a9f0cb02f3b2734d58e36d80b790b6f0a66229990710c3d2194e27310578cb17672c9ac5caf7e8eec3edb944f8db1fa85e6 WHIRLPOOL 0aa180554bfd225bfbbed5fc1ce9c5c4ef1cb8a2f40db01ca3287c17b036bbe51a34b4b66cd4e15aa31803b52da83229d389e7c469d41e461f3ac1ea86a5a8d5
+MISC ChangeLog 2483 SHA256 c3d9db75aacc7ca5756b737dfe224ba931718da163ccd9f653fcee2a67d82274 SHA512 64157d33c4bfd98485c918408b0326d08e831ee3b61e3fb74302253dc2569ba9b310cf8c1dd8fc4a808a39eca34d18cd5adf82f40a1e8123ff46a93592fc1381 WHIRLPOOL badb2027915e879fd33f42c95eac7c5d6b1078852632aeaa37cd172ba632d6415c8e45654b14d55e823adbddaefa0ada80d969aa8afc123f4eee7f3998e1bb6e
 MISC metadata.xml 369 SHA256 fbf0c047dd8f31baf2319b73779aa528e5c22283e2eb6f1b68a826e42b7eedc7 SHA512 1588487b3894d396348e5754ae1d9f93a0a7b2e72b87f59c4ce6ec6ae2564b6c7cd7fb40c098009989143412cdd3affbb6a7e07ea10f7955357d1c8b2fb41377 WHIRLPOOL c686ffb6a35eeee66c8316d686b1066fef117b216b264c96a84d21eb8d79718456babc43db707af119c84bf3f99946d64572c32cf5a05ee82b65315448255bd0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTBzgVAAoJEIMvOqnEeZDCFuQIAIUXeflKdUWxBs98ZDbDVlqE
-cOuny6VSJy07b0VKKadFrZa6uRD7lWPPP+175XZIUAkLZq7m2ibO23M3Xvuck/O6
-sQZuRw/yp80Vfpo+QfnCGIu025RW7OujNFg2P+MHDVP13a5DX9UNEyPXEHzqjegm
-0/OYUCJpCo5bxzWAmY/m2JPpzNsauK58OTdGfaSyd3+0sKdNE6AqKLa4iOvO9G8H
-xKFWFZ37aIv29tt0Y2mOnZkWlpfVBM7sSTwZqtKt+Nbyz0WjsmO9ehcasxzKextI
-iFRJu+e4QP6U9VWCvbu3vLteb69WLMKm0nhpxJT8uM6Szk6yqU3Z6d5uRtx2B1c=
-=Ww2X
+iQEcBAEBCAAGBQJTkCuHAAoJECo/aRed9267ZPMH/0m2MokFSuUoyQryKDh1gV+M
+DssmuaSPFgKxEOrOSgFEtei5DBftQb8FVhpI6ZxM9XYjj4goLT87RfRkHrJxQujC
++2c9nYeUOnxxkLMlLDCUKDgQNxqxqCqkjbAE8RkVwoR2Kuk4Giv3N3CSfnusJRpY
++em6obDUx9xdXaumhkJdzi7TJRFn4I/BkUiKVSd41U7rO1rzyFTtygJPJ4+xMlLk
+/YnFVqcP/H/qyembHfV4w6go6xvOUR7scJAtcmlYGs269nEu9oxiZK9Zh1GRz4ti
+mNz9z2BsHm1mC0wPons6hrfsiF7Yd6oAvzO2cNQBPqlUqohbktQOVnCZj9xdnRs=
+=Ws/Y
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/dovecot_deleted_to_trash/dovecot_deleted_to_trash-0.3.ebuild b/mail-filter/dovecot_deleted_to_trash/dovecot_deleted_to_trash-0.3.ebuild
deleted file mode 100644
index 2e04927dea1d..000000000000
--- a/mail-filter/dovecot_deleted_to_trash/dovecot_deleted_to_trash-0.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dovecot_deleted_to_trash/dovecot_deleted_to_trash-0.3.ebuild,v 1.7 2013/02/25 13:31:45 ago Exp $
-
-EAPI=4
-
-inherit base multilib toolchain-funcs
-
-DESCRIPTION="Deleted to trash IMAP plugin for Dovecot"
-HOMEPAGE="http://wiki.dovecot.org/Plugins/deleted-to-trash"
-SRC_URI="http://wiki2.dovecot.org/Plugins/deleted-to-trash?action=AttachFile&do=get&target=deleted-to-trash-plugin_${PV}_for_dovecot_2.tar -> ${P}.tar"
-
-LICENSE="ZLIB" # ZLIB without 3rd clause
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
-IUSE=""
-
-RDEPEND="=net-mail/dovecot-2.0*"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	sed -e "/DOVECOT_IMAP_PLUGIN_PATH/s/lib/$(get_libdir)/g"  \
-		-e "/DOVECOT_IMAP_PLUGIN_PATH/s/imap//" \
-		-e "/PLUGIN_NAME/s/lib/lib99/" -i Makefile || die 'sed on Makefile failed'
-	base_src_prepare
-}
-
-src_compile() {
-	tc-export CC
-	base_src_compile
-}
-
-src_install() {
-	base_src_install
-
-	insinto /etc/dovecot/conf.d
-	doins "${FILESDIR}"/29-delete-to-trash.conf
-}
diff --git a/mail-filter/dovecot_deleted_to_trash/dovecot_deleted_to_trash-0.5.ebuild b/mail-filter/dovecot_deleted_to_trash/dovecot_deleted_to_trash-0.5.ebuild
deleted file mode 100644
index cf111036626a..000000000000
--- a/mail-filter/dovecot_deleted_to_trash/dovecot_deleted_to_trash-0.5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dovecot_deleted_to_trash/dovecot_deleted_to_trash-0.5.ebuild,v 1.1 2013/07/14 07:31:04 qnikst Exp $
-
-EAPI=5
-
-inherit toolchain-funcs base
-
-DESCRIPTION="Deleted to trash IMAP plugin for Dovecot"
-HOMEPAGE="https://github.com/lexbrugman/dovecot_deleted_to_trash"
-SRC_URI="http://rion-overlay.googlecode.com/files/dovecot_deleted_to_trash-0.5.tar.bz2"
-
-LICENSE="ZLIB"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-IUSE=""
-RDEPEND="=net-mail/dovecot-2.1*
-	!!<net-mail/dovecot-2.1.0
-	!!<=mail-filter/dovecot_deleted_to_trash-0.3
-	"
-
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	"
-
-PATCHES=( "${FILESDIR}"/fix_names_and_destdir.patch )
-
-#S="${WORKDIR}"
-
-src_compile() {
-	tc-export CC
-	base_src_compile
-}
-
-src_install() {
-	base_src_install
-
-	insinto /etc/dovecot/conf.d
-	doins "${FILESDIR}"/29-delete-to-trash.conf
-}
diff --git a/mail-filter/dovecot_deleted_to_trash/dovecot_deleted_to_trash-0.6.ebuild b/mail-filter/dovecot_deleted_to_trash/dovecot_deleted_to_trash-0.6.ebuild
new file mode 100644
index 000000000000..499d3e9a8b83
--- /dev/null
+++ b/mail-filter/dovecot_deleted_to_trash/dovecot_deleted_to_trash-0.6.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dovecot_deleted_to_trash/dovecot_deleted_to_trash-0.6.ebuild,v 1.1 2014/06/05 08:34:49 pinkbyte Exp $
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="Deleted to trash IMAP plugin for Dovecot"
+HOMEPAGE="https://github.com/lexbrugman/dovecot_deleted_to_trash"
+SRC_URI="https://github.com/lexbrugman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+RDEPEND="=net-mail/dovecot-2.2*
+	!!<net-mail/dovecot-2.2.0
+	!!<=mail-filter/dovecot_deleted_to_trash-0.3
+	"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	tc-export CC
+	sed -i \
+		-e "/DOVECOT_IMAP_PLUGIN_PATH/s:lib/dovecot/modules:$(get_libdir)/dovecot:" \
+		-e "/PLUGIN_NAME/s/lib/lib99/" \
+		Makefile || die
+	epatch_user
+}
+
+src_install() {
+	default
+	insinto /etc/dovecot/conf.d
+	doins "${FILESDIR}"/29-delete-to-trash.conf
+}
diff --git a/mail-filter/dovecot_deleted_to_trash/files/fix_names_and_destdir.patch b/mail-filter/dovecot_deleted_to_trash/files/fix_names_and_destdir.patch
deleted file mode 100644
index a9c2cb312fe6..000000000000
--- a/mail-filter/dovecot_deleted_to_trash/files/fix_names_and_destdir.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- Makefile.old	2012-08-24 11:10:58.083907845 +0300
-+++ Makefile	2012-08-24 11:13:34.167906088 +0300
-@@ -5,13 +5,13 @@
- # Dovecot's header directory
- DOVECOT_INC_PATH = /usr/include/dovecot
- # Dovecot's IMAP plugin path
--DOVECOT_IMAP_PLUGIN_PATH = /usr/lib/dovecot/imap
-+DOVECOT_IMAP_PLUGIN_PATH = /usr/lib/dovecot/
- 
- ## usually no need to configure anything below this line ##
- 
- # plugin source & target name #
- PLUGIN_SOURCES = deleted-to-trash-plugin.c
--PLUGIN_NAME = lib_deleted_to_trash_plugin.so
-+PLUGIN_NAME = lib99_deleted_to_trash_plugin.so
- 
- #### configuration end ####
-