commit:     14e7d067427a0dd0ec0c9d0c6903edb4560a4817
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 10 12:20:33 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Nov 10 12:20:33 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=14e7d067

net-ftp/bbftp-server: Bump EAPI; respect CC; version Bump

Package-Manager: portage-2.2.14

---
 net-ftp/bbftp-server/ChangeLog                     |  6 +++-
 ...rver-3.2.0.ebuild => bbftp-server-3.2.1.ebuild} | 42 +++++++++++++---------
 net-ftp/bbftp-server/metadata.xml                  |  4 +--
 3 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/net-ftp/bbftp-server/ChangeLog b/net-ftp/bbftp-server/ChangeLog
index b73e12c..0c46987 100644
--- a/net-ftp/bbftp-server/ChangeLog
+++ b/net-ftp/bbftp-server/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for net-ftp/bbftp-server
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  10 Nov 2014; Justin Lecher <[email protected]> -bbftp-server-3.2.0.ebuild,
+  +bbftp-server-3.2.1.ebuild, metadata.xml:
+  Bump EAPI; respect CC; version Bump
+
   24 Jun 2011; Justin Lecher <[email protected]> bbftp-server-3.2.0.ebuild:
   Sort inherit and/or USE
 

diff --git a/net-ftp/bbftp-server/bbftp-server-3.2.0.ebuild 
b/net-ftp/bbftp-server/bbftp-server-3.2.1.ebuild
similarity index 56%
rename from net-ftp/bbftp-server/bbftp-server-3.2.0.ebuild
rename to net-ftp/bbftp-server/bbftp-server-3.2.1.ebuild
index c24f9c1..177c183 100644
--- a/net-ftp/bbftp-server/bbftp-server-3.2.0.ebuild
+++ b/net-ftp/bbftp-server/bbftp-server-3.2.1.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils
+EAPI=5
 
-DESCRIPTION="Secure file transfer software with its own transfer protocol 
optimized for files larger than 2GB"
+inherit eutils toolchain-funcs
 
+DESCRIPTION="Secure file transfer software with its own transfer protocol 
optimized for files larger than 2GB"
 HOMEPAGE="http://doc.in2p3.fr/bbftp/";
 SRC_URI="http://doc.in2p3.fr/bbftp/dist/${P}.tar.gz";
-S="${WORKDIR}/${P}/bbftpd"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -18,29 +18,37 @@ IUSE="pam ssl"
 DEPEND="ssl? ( dev-libs/openssl )"
 RDEPEND="${DEPEND}"
 
-src_unpack() {
-       unpack ${A}
-       cd "${WORKDIR}/${P}"
+S="${WORKDIR}/${P}/bbftpd"
+
+src_prepare() {
        epatch "${FILESDIR}"/${PV}-deffixes.patch
+
+       sed \
+               -e 
'/@INSTALL@\|mkdir/s:${\(prefix\|mandir\|bindir\)}:${DESTDIR}${\1}:' \
+               -e '/\/etc/d' \
+               -i Makefile.in
+
+       tc-export CC
 }
 
-src_compile() {
-       sed -i -e 
'/@INSTALL@\|mkdir/s:${\(prefix\|mandir\|bindir\)}:${DESTDIR}${\1}:' -e 
'/\/etc/d' Makefile.in
-       econf $(use_with ssl) $(use_with pam) --with-gzip \
+src_configure() {
+       econf \
+               $(use_with ssl) \
+               $(use_with pam) \
+               --with-gzip \
                --without-rfio \
-               --without-afs || die "configure failed"
-       emake || die "compile failed"
+               --without-afs
 }
 
 src_install() {
-       emake DESTDIR="${D}" install || die "install failed"
-       newinitd "${FILESDIR}/bbftpd.init.d" bbftpd
-       dodoc ../README ../ChangeLog ../TODO
-       dodoc ../doc/*
+       default
+
+       newinitd "${FILESDIR}"/bbftpd.init.d bbftpd
+       dodoc ../README ../ChangeLog ../TODO ../doc/*
        doman ../doc/bbftpd.1
        if use pam; then
-               echo -e "#%PAM-1.0\nauth include system-auth\naccount include 
system-auth" >> "${T}/bbftp.pam"
+               echo -e "#%PAM-1.0\nauth include system-auth\naccount include 
system-auth" >> "${T}"/bbftp.pam
                insinto /etc/pam.d
-               newins "${T}/bbftp.pam" bbftp
+               newins "${T}"/bbftp.pam bbftp
        fi
 }

diff --git a/net-ftp/bbftp-server/metadata.xml 
b/net-ftp/bbftp-server/metadata.xml
index 7e915aa..7e5e956 100644
--- a/net-ftp/bbftp-server/metadata.xml
+++ b/net-ftp/bbftp-server/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-<herd>sci</herd>
-<longdescription>
+  <herd>sci</herd>
+  <longdescription>
 bbFTP is a file transfer software. It implements its own transfer protocol,
 which is optimized for large files (larger than 2GB) and secure as it does not
 read the password in a file and encrypts the connection information.

Reply via email to