pinkbyte    14/06/22 15:34:04

  Modified:             ChangeLog capi4k-utils-20050718-r6.ebuild
  Log:
  Improve fix for bug #511800 by utilizing versionator eclass
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 
0x1F357D42)

Revision  Changes    Path
1.78                 net-dialup/capi4k-utils/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dialup/capi4k-utils/ChangeLog?rev=1.78&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dialup/capi4k-utils/ChangeLog?rev=1.78&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dialup/capi4k-utils/ChangeLog?r1=1.77&r2=1.78

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/ChangeLog,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- ChangeLog   16 Jun 2014 12:19:03 -0000      1.77
+++ ChangeLog   22 Jun 2014 15:34:04 -0000      1.78
@@ -1,6 +1,10 @@
 # ChangeLog for net-dialup/capi4k-utils
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/ChangeLog,v 1.77 
2014/06/16 12:19:03 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/ChangeLog,v 1.78 
2014/06/22 15:34:04 pinkbyte Exp $
+
+  22 Jun 2014; Sergey Popov <pinkb...@gentoo.org>
+  capi4k-utils-20050718-r6.ebuild:
+  Improve fix for bug #511800 by utilizing versionator eclass
 
   16 Jun 2014; Sergey Popov <pinkb...@gentoo.org>
   capi4k-utils-20050718-r6.ebuild:



1.3                  net-dialup/capi4k-utils/capi4k-utils-20050718-r6.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dialup/capi4k-utils/capi4k-utils-20050718-r6.ebuild?rev=1.3&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dialup/capi4k-utils/capi4k-utils-20050718-r6.ebuild?rev=1.3&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dialup/capi4k-utils/capi4k-utils-20050718-r6.ebuild?r1=1.2&r2=1.3

Index: capi4k-utils-20050718-r6.ebuild
===================================================================
RCS file: 
/var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/capi4k-utils-20050718-r6.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- capi4k-utils-20050718-r6.ebuild     16 Jun 2014 12:19:03 -0000      1.2
+++ capi4k-utils-20050718-r6.ebuild     22 Jun 2014 15:34:04 -0000      1.3
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/capi4k-utils-20050718-r6.ebuild,v
 1.2 2014/06/16 12:19:03 pinkbyte Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/capi4k-utils-20050718-r6.ebuild,v
 1.3 2014/06/22 15:34:04 pinkbyte Exp $
 
 EAPI=5
 
-inherit eutils linux-info multilib
+inherit eutils linux-info multilib versionator
 
 YEAR_PV="${PV:0:4}"
 MON_PV="${PV:4:2}"
@@ -50,6 +50,7 @@
        if use pppd; then
                local INSTALLED_PPP="$(best_version net-dialup/ppp)"
                PPPVERSION="${INSTALLED_PPP#net-dialup/ppp-}"
+               PPPVERSION="$(version_format_string '$1.$2.$3' ${PPPVERSION})"
                if [ -z "${PPPVERSION}" ]; then
                        die "No pppd installation found"
                fi
@@ -101,7 +102,7 @@
                # workaround for bug #511800
                if has_version \>=net-dialup/ppp-2.4.6; then
                        pushd pppdcapiplugin &>/dev/null || die
-                       ln -s ppp-2.4.5 "ppp-${PPPVERSION}" || die
+                       mv ppp-2.4.5 "ppp-${PPPVERSION}" || die
                        popd &>/dev/null
                fi
        else




Reply via email to