diff options
| author |   Sergey Popov <pinkbyte@gentoo.org> | 2012-11-27 07:30:48 +0000 |
|---|---|---|
| committer | Sergey Popov <pinkbyte@gentoo.org> | 2012-11-27 07:30:48 +0000 |
| commit | 1ba1c336a5d11e6f4deec5c3e95d8a64489af4ba (patch) | |
| tree | f78bbcddb4816e30e567e7a9d3c2d3979939dbd6 /mail-filter | |
| parent | Version bump. (diff) | |
| download | historical-1ba1c336a5d11e6f4deec5c3e95d8a64489af4ba.tar.gz historical-1ba1c336a5d11e6f4deec5c3e95d8a64489af4ba.tar.bz2 historical-1ba1c336a5d11e6f4deec5c3e95d8a64489af4ba.zip | |
Set proper path for libs, reorganize patch into sed expressions, wrt bug #444840. Thanks to Agostino Sarubbo and Andreis Vinogradovs
Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Diffstat (limited to 'mail-filter')
4 files changed, 17 insertions, 45 deletions
diff --git a/mail-filter/dovecot_deleted_to_trash/ChangeLog b/mail-filter/dovecot_deleted_to_trash/ChangeLog index bf3cad32ceb1..63d77f1b8419 100644 --- a/mail-filter/dovecot_deleted_to_trash/ChangeLog +++ b/mail-filter/dovecot_deleted_to_trash/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for mail-filter/dovecot_deleted_to_trash # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/dovecot_deleted_to_trash/ChangeLog,v 1.3 2012/11/10 13:51:57 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/dovecot_deleted_to_trash/ChangeLog,v 1.4 2012/11/27 07:30:44 pinkbyte Exp $ + + 27 Nov 2012; Sergey Popov <pinkbyte@gentoo.org> + dovecot_deleted_to_trash-0.3.ebuild, -files/fix_names_and_destdir.patch: + Set proper path for libs, reorganize patch into sed expressions, wrt bug + #444840. Thanks to Agostino Sarubbo and Andreis Vinogradovs 10 Nov 2012; Anthony G. Basile <blueness@gentoo.org> dovecot_deleted_to_trash-0.3.ebuild: diff --git a/mail-filter/dovecot_deleted_to_trash/Manifest b/mail-filter/dovecot_deleted_to_trash/Manifest index 137723652051..72f43c9f845a 100644 --- a/mail-filter/dovecot_deleted_to_trash/Manifest +++ b/mail-filter/dovecot_deleted_to_trash/Manifest @@ -1,26 +1,5 @@ ------BEGIN PGP SIGNED MESSAGE----- -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 -EBUILD dovecot_deleted_to_trash-0.3.ebuild 923 SHA256 a9bb2b651108c6c0345f9cea907ee122908fb55453fe1504599fff1c2753b3c3 SHA512 e217c1e24b6ae9ab341ce8ccba68a5eaac8128e484f61bc58419250e598a8bf9ad58701e00bdf0cae0b7a12b4e78498eca3d1e2e121e871daa079a9e313dfa72 WHIRLPOOL 4690025a5384b4724159f026b43f58d0ff48b042168a2d069b52ea025ec3798f3c960ebcc9045a8d59a600d9338a45a075dade96b76b4f724bff4ba4edf71a91 -MISC ChangeLog 797 SHA256 c3fd3d31eec2e6dd8e167f725cb8bba2e5b98c99d280ed4a5fbc295e7d813a06 SHA512 3158cacdeb6a3fa1bea464ed802d4371cabce53a166d7c1e3cdc0e3e6d7a6a699e67427fc4cea793cf3918273796acc29c5ad9b57acef1e4181ae4a730b99fa0 WHIRLPOOL 2338919aa1d4ed93781c3bfdc5d6a55f10453bb35b02f264e9a9ff8ae8e84da70fca54e2a0947ebb25b14b3698b1842caaaac6f6655e1186f0d77d3cf7486c48 +EBUILD dovecot_deleted_to_trash-0.3.ebuild 1097 SHA256 7fc0831c5761ab4723c506bdaa861c656371b46aebfdb114d201fb737531c5ff SHA512 f2329c7b930985079ef736d9f2858c8e30c489927aa64722c8a6e6674001f7aefa6951a202a45336fab5994c68adb9e67c95a7e70d0cb9c55a8e072c7b164d2c WHIRLPOOL 5317f00e2f19d0fae1537262a8f31911e32586513a0ddd478dad65c526108982c982554d9f24f6900840f5061d6ef9bd315c717d192ffb3f1524521f42d7e9b2 +MISC ChangeLog 1060 SHA256 46aaa86e5b31c1a20b30d5715c13dd311fbbf1a915bc1aacee5237843bf3bdf5 SHA512 13f373106f0290e4735b3bfaaec3ae11620eac040d22704edae3019d6b555ae003e02f06327537d5a7bfd9ea64d9dd666c437c472969017c181a84053f1a7188 WHIRLPOOL f531cd5e34432e714f9af446df9410838d5337b2652739bf822a17a26a9ae0b68c020fe79f2542d0cbcf68af9ba65fecf69c8f61b5c125d9b337cdc92b9b07dd MISC metadata.xml 369 SHA256 fbf0c047dd8f31baf2319b73779aa528e5c22283e2eb6f1b68a826e42b7eedc7 SHA512 1588487b3894d396348e5754ae1d9f93a0a7b2e72b87f59c4ce6ec6ae2564b6c7cd7fb40c098009989143412cdd3affbb6a7e07ea10f7955357d1c8b2fb41377 WHIRLPOOL c686ffb6a35eeee66c8316d686b1066fef117b216b264c96a84d21eb8d79718456babc43db707af119c84bf3f99946d64572c32cf5a05ee82b65315448255bd0 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) - -iQIcBAEBCAAGBQJQnlv8AAoJEJOE+m71LUu6nu4P/joI8E2zMT0CDiDtl730o5pb -TLVzakBcXOjBtLsfinxFgyTAoNGgMDQ6TaRYIPKX/sSiGXjF9/+rFnkeSyhuGUnA -k6yQWbKGVyMzm+cx2WJX/pVzQ5W0nuaCq4GuBc2PdiBRvR40EBe3oMKo1BF/mOeP -37CX2/tZ4rKrB11H+7x1Lq226+HgVcubSExS4qVFokteOTCPF+Xpn0sFwXenuaHe -VewmMDET04f3yHWrRF7XCzMuoMBrxUNj5lGisbFpfHHVjMfy7Bul+KjUr8BoWd+n -01V/N0Xy07fgOP9RI5p9ZoRCQXqe2CVL2498D6o9o+iAjtUT3DsbsOB5Kyb+vIl/ -JAxwG1RLP/26l89BKSK6/yUcp3/2jPrAfTkJlgkb+497RXsxdBhNJiBjrZXs6HIi -HXlRodZHN8q5Qf1D+RK4K9bgn9Kn0sQCCFE+vgAwvZXWLaealFtYFJWz1UQqVaG+ -pRDqKunoqN6RtfFbYTP9O3b2FhpKOmV74bMrHccdTkojy8qm5PsWMXkL1hPHjMAC -PPTrgpjCXS3K9arTFRUcn67etCP6cOblIgEMujw0cZqSSH3OQNVv/UV1f7RFiSCK -qG8Dqby1EAyLhSIHj1HiJq+M8EmSPCv8tYWHBRXNMlF0qz2GGj1S4jOCQPSounW2 -tefqNSExMQ0zlhBOdA6e -=tb0l ------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 index c2e2425e9be6..7d74799ef518 100644 --- 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 @@ -1,10 +1,10 @@ # Copyright 1999-2012 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.3 2012/11/10 13:51:57 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/dovecot_deleted_to_trash/dovecot_deleted_to_trash-0.3.ebuild,v 1.4 2012/11/27 07:30:44 pinkbyte Exp $ EAPI=4 -inherit toolchain-funcs base +inherit base multilib toolchain-funcs DESCRIPTION="Deleted to trash IMAP plugin for Dovecot" HOMEPAGE="http://wiki.dovecot.org/Plugins/deleted-to-trash" @@ -17,10 +17,16 @@ SLOT="0" IUSE="" RDEPEND="=net-mail/dovecot-2.0*" DEPEND="${RDEPEND}" -PATCHES=( "${FILESDIR}"/fix_names_and_destdir.patch ) 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 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 #### - |