From 521d2c3042bdc6dce34459619e6ff3bfa2d1efd0 Mon Sep 17 00:00:00 2001 From: Bertrand Jacquin Date: Mon, 21 Oct 2013 16:17:24 +0200 Subject: net-mail/davmail-bin: Migrate to EAPI 5, fix KEYWORDS, install in /opt/davemail Package-Manager: portage-2.2.7 --- metadata/md5-cache/net-mail/davmail-bin-4.1.0.2042 | 6 +++--- net-mail/davmail-bin/ChangeLog | 5 +++++ net-mail/davmail-bin/Manifest | 4 ++-- net-mail/davmail-bin/davmail-bin-4.1.0.2042.ebuild | 16 +++++++--------- 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/metadata/md5-cache/net-mail/davmail-bin-4.1.0.2042 b/metadata/md5-cache/net-mail/davmail-bin-4.1.0.2042 index 86940d12..628bc2ea 100644 --- a/metadata/md5-cache/net-mail/davmail-bin-4.1.0.2042 +++ b/metadata/md5-cache/net-mail/davmail-bin-4.1.0.2042 @@ -1,12 +1,12 @@ DEFINED_PHASES=install DEPEND=>=virtual/jre-1.6 DESCRIPTION=POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange Gateway -EAPI=4 +EAPI=5 HOMEPAGE=http://davmail.sourceforge.net/ -KEYWORDS=-* ~amd64 ~x86 +KEYWORDS=~amd64 ~x86 LICENSE=GPL-2 RDEPEND=>=virtual/jre-1.6 dev-java/swt SLOT=0 SRC_URI=x86? ( mirror://sourceforge/davmail/davmail-linux-x86-4.1.0-2042.tgz ) amd64? ( mirror://sourceforge/davmail/davmail-linux-x86_64-4.1.0-2042.tgz ) _eclasses_=eutils 4878e7f88afc0ba0866ac112190b0fd4 multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 51e6c948e72c43bcc8edc7544411c953 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 -_md5_=a6250fe19741ae5286d5f1684c88d9ff +_md5_=e7405e23db4ec7949612c831862fb886 diff --git a/net-mail/davmail-bin/ChangeLog b/net-mail/davmail-bin/ChangeLog index 220a069e..9245298f 100644 --- a/net-mail/davmail-bin/ChangeLog +++ b/net-mail/davmail-bin/ChangeLog @@ -1,3 +1,8 @@ + 21 Oct 2013; Bertrand Jacquin + davmail-bin-4.1.0.2042.ebuild: + net-mail/davmail-bin: Migrate to EAPI 5, fix KEYWORDS, install in + /opt/davemail + *davmail-bin-4.1.0.2042 (17 Oct 2013) 17 Oct 2013; Bertrand Jacquin diff --git a/net-mail/davmail-bin/Manifest b/net-mail/davmail-bin/Manifest index 17a64fef..be46ea1a 100644 --- a/net-mail/davmail-bin/Manifest +++ b/net-mail/davmail-bin/Manifest @@ -2,6 +2,6 @@ AUX davmail.desktop 203 SHA256 3e4bc2a1ea64cbd47290df4eb07f51a5be2863d9314d5381e AUX davmail.png 4218 SHA256 b50a1e8d9ac3e20acf88f77d9524f986041282e9f6ae120c78ee64cf6a20df7e WHIRLPOOL 1c2e4d8d8f5b318878eedbb7676ee5622429fe0a08d2598fc2cba75daa08b3844afabc87360b9f8d6e00aa419f5d5268e738f598b7793efc992cb22144014550 DIST davmail-linux-x86-4.1.0-2042.tgz 6475141 SHA256 b09625ca6ff71e8d462e9ce4a14df326ec6977000ba4537d34e5451dab5cbc46 SHA512 4d1b0b29b92298920e8843da3233bb0fac85458c2c8d6bca08ab5092f51de7fc0b8a9b6c07c831a4caee6b415e9afb6a2247c7010031f20dd939b992bf7c6722 WHIRLPOOL 457a10afd2c6c6172a8b77095fcc76044f2cadbceccf9e1f69eb5c2a63a2ad9c8de8bf22d3b31d44f220f4fd5590d18a1c2799d73894c37dc8b87f5f7429975d DIST davmail-linux-x86_64-4.1.0-2042.tgz 6621416 SHA256 a5aea7380e77c53e3649ca76cf7ef90c5a10f31a714b73df9cbb9ef9bd1f800b SHA512 73a8b00f15601606b2d3239b73199da67ab2d2bed75ca84b5af1a4eb652f14d95d630d66b10ab6894899c1ade96ebe51ce3d149fb11463fd2888e875dcd34cdf WHIRLPOOL e68dd826b49a46b842b95a6bc2122392e7dd31b7f023ff26df598acb6437f4ae847e53b7d8e1cb518b5911f59cd86f1dd3059f64d54d2206e4528a82a25f48a9 -EBUILD davmail-bin-4.1.0.2042.ebuild 1019 SHA256 7173b714eeea4f436dcad904c903d4d640fdbdf8d8fefbfaad4e275972cde16b WHIRLPOOL 21ec96f7f5b9f55d9a1c909be6075469b947775ff3715aa644e504462b815eb24afd2a991aaea7d0494014ff8cfd1ca1e2b906c3fce78476eecd05781fcb456c -MISC ChangeLog 297 SHA256 dd4812588891c014b3809a2a5009cea736225d4eeb401d74222f3bb313cd4a65 WHIRLPOOL ae46b48512acca524e3dfafabe0302dd0ee818d16419bde8804f29bd23c34c25f93ff420bca825d2239f7672ea4ef0603ff4ea1861ff1f24d7b92a3a6202cc3b +EBUILD davmail-bin-4.1.0.2042.ebuild 1017 SHA256 ce45d06e0c8b4602ee4173908c4792ff8db9da56f28479e80ac46335728a3546 WHIRLPOOL 17cfbcd4b0793b8171384235117c999ea324d6c2b1ed75914c889fdd14d9ba7ff24c0c5c593889029b75a81e5ea8dc3d4f7292eb80145603a69c601b136ce53b +MISC ChangeLog 468 SHA256 88cec5cfe348f56c801f72e161722cd725656ebb8e0c5bbaf0e4b61370b22877 WHIRLPOOL d448194357c2ddf95fe289ddd30bb20411c37c1bac88ee435e82b111eac10981268e03f1782d48458b5f014ce1ba943f2a75685966383a82e38d551a4e87f49d MISC metadata.xml 232 SHA256 3e0886d31df5e2b8735dfa995ed12280c69f959a90a4e9d54bafd527110282a3 WHIRLPOOL 47858cf96e435c48f17bc5abc285679acfcc01927852d6809a02c7610b16b81b145f23673070e1f3ae7354dd3876f882f6f00e2ba7320f50150b5c13f140e75b diff --git a/net-mail/davmail-bin/davmail-bin-4.1.0.2042.ebuild b/net-mail/davmail-bin/davmail-bin-4.1.0.2042.ebuild index 7349e93d..b4aa8dd1 100644 --- a/net-mail/davmail-bin/davmail-bin-4.1.0.2042.ebuild +++ b/net-mail/davmail-bin/davmail-bin-4.1.0.2042.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=4 +EAPI=5 inherit eutils versionator @@ -16,7 +16,7 @@ SRC_URI="x86? ( mirror://sourceforge/${MY_PN}/${MY_PN}-linux-x86-${MY_PV}.tgz ) LICENSE="GPL-2" SLOT="0" -KEYWORDS="-* ~amd64 ~x86" +KEYWORDS="~amd64 ~x86" IUSE="" DEPEND=">=virtual/jre-1.6" @@ -24,20 +24,18 @@ RDEPEND="${DEPEND} dev-java/swt " -use x86 && S="${WORKDIR}/${MY_PN}-linux-x86-${MY_PV}" +use x86 && S="${WORKDIR}/${MY_PN}-linux-x86-${MY_PV}" use amd64 && S="${WORKDIR}/${MY_PN}-linux-x86_64-${MY_PV}" src_install() { - cd "${S}" - # Fix the script BASE= - sed -i -e "s@BASE=.*@BASE=/opt/davmail@" davmail.sh + sed -i -e "s@BASE=.*@BASE=/opt/${MY_PN}@" davmail.sh - dodir "/opt/${PN}" - cp -a * "${D}/opt/${PN}" + dodir "/opt/${MY_PN}" + cp -a * "${ED}/opt/${MY_PN}" dodir "/opt/bin" - dosym "/opt/${PN}/davmail.sh" "/opt/bin/davmail.sh" + dosym "/opt/${MY_PN}/davmail.sh" "/opt/bin/davmail.sh" domenu "${FILESDIR}"/davmail.desktop doicon "${FILESDIR}"/davmail.png -- cgit v1.2.3