From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E025813881C for ; Thu, 24 Sep 2015 17:33:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 35D1521C071; Thu, 24 Sep 2015 17:33:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B8A6D21C071 for ; Thu, 24 Sep 2015 17:33:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5FD2C3409FC for ; Thu, 24 Sep 2015 17:33:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A24721F5 for ; Thu, 24 Sep 2015 17:33:50 +0000 (UTC) From: "Eray Aslan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Eray Aslan" Message-ID: <1443116009.7fb393aeb888002be6672392622f80749be11316.eras@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: mail-mta/postfix/ X-VCS-Repository: repo/gentoo X-VCS-Files: mail-mta/postfix/postfix-3.0.2-r1.ebuild mail-mta/postfix/postfix-3.1_pre20150913.ebuild X-VCS-Directories: mail-mta/postfix/ X-VCS-Committer: eras X-VCS-Committer-Name: Eray Aslan X-VCS-Revision: 7fb393aeb888002be6672392622f80749be11316 X-VCS-Branch: master Date: Thu, 24 Sep 2015 17:33:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d43921c7-8ed2-4484-8d90-bb6f1db14fc7 X-Archives-Hash: 458efa30ba6d30674e169dc508a46ba6 commit: 7fb393aeb888002be6672392622f80749be11316 Author: Eray Aslan gentoo org> AuthorDate: Thu Sep 24 17:33:29 2015 +0000 Commit: Eray Aslan gentoo org> CommitDate: Thu Sep 24 17:33:29 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fb393ae mail-mta/postfix: Fix multi instance setup Gentoo-Bug: 561278 Package-Manager: portage-2.2.21 ...ostfix-3.1_pre20150913.ebuild => postfix-3.0.2-r1.ebuild} | 12 ++++++++---- mail-mta/postfix/postfix-3.1_pre20150913.ebuild | 1 - 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/mail-mta/postfix/postfix-3.1_pre20150913.ebuild b/mail-mta/postfix/postfix-3.0.2-r1.ebuild similarity index 95% copy from mail-mta/postfix/postfix-3.1_pre20150913.ebuild copy to mail-mta/postfix/postfix-3.0.2-r1.ebuild index cbbcfdc..679f48e 100644 --- a/mail-mta/postfix/postfix-3.1_pre20150913.ebuild +++ b/mail-mta/postfix/postfix-3.0.2-r1.ebuild @@ -5,9 +5,9 @@ EAPI=5 inherit eutils flag-o-matic multilib pam ssl-cert systemd toolchain-funcs user versionator -MY_PV="${PV/_pre/-}" +MY_PV="${PV/_rc/-RC}" MY_SRC="${PN}-${MY_PV}" -MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/experimental" +MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official" VDA_PV="2.10.0" VDA_P="${PN}-vda-v13-${VDA_PV}" RC_VER="2.7" @@ -80,6 +80,11 @@ src_prepare() { # change default paths to better comply with portage standard paths sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed" + sed -i -e "/readme_directory\/CONNECTION_CACHE_README/ i\ + \$readme_directory\/COMPATIBILITY_README:f:root:-:644" conf/postfix-files + sed -i -e "/html_directory\/CONNECTION_CACHE_README/ i\ + \$html_directory\/COMPATIBILITY_README.html:f:root:-:644" conf/postfix-files + epatch_user } @@ -192,7 +197,7 @@ src_configure() { sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs - emake makefiles shared=yes dynamicmaps=no pie=yes \ + emake makefiles shared=yes dynamicmaps=no \ shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \ DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \ AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \ @@ -267,7 +272,6 @@ src_install () { use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix" dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES* - mv "${D}"/etc/postfix/{*.default,*.proto} "${D}"/usr/share/doc/${PF}/ use doc && mv "${S}"/examples "${D}"/usr/share/doc/${PF}/ pamd_mimic_system smtp auth account diff --git a/mail-mta/postfix/postfix-3.1_pre20150913.ebuild b/mail-mta/postfix/postfix-3.1_pre20150913.ebuild index cbbcfdc..14d5902 100644 --- a/mail-mta/postfix/postfix-3.1_pre20150913.ebuild +++ b/mail-mta/postfix/postfix-3.1_pre20150913.ebuild @@ -267,7 +267,6 @@ src_install () { use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix" dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES* - mv "${D}"/etc/postfix/{*.default,*.proto} "${D}"/usr/share/doc/${PF}/ use doc && mv "${S}"/examples "${D}"/usr/share/doc/${PF}/ pamd_mimic_system smtp auth account