summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlin Năstac <mrness@gentoo.org>2006-04-01 07:53:24 +0000
committerAlin Năstac <mrness@gentoo.org>2006-04-01 07:53:24 +0000
commitde48d0188ca6cc75de1bfbe701b10950e1ddd807 (patch)
tree4dc2432364521db12778d5321f033e0d0c17005f /net-dialup
parentUpdate to new patch revision, fix some file permission and remove patch which... (diff)
downloadgentoo-2-de48d0188ca6cc75de1bfbe701b10950e1ddd807.tar.gz
gentoo-2-de48d0188ca6cc75de1bfbe701b10950e1ddd807.tar.bz2
gentoo-2-de48d0188ca6cc75de1bfbe701b10950e1ddd807.zip
Bail out in pkg_setup if the old /etc/init.d/rp-pppoe still exist.
(Portage version: 2.0.54)
Diffstat (limited to 'net-dialup')
-rw-r--r--net-dialup/rp-pppoe/ChangeLog5
-rw-r--r--net-dialup/rp-pppoe/rp-pppoe-3.7.ebuild15
2 files changed, 18 insertions, 2 deletions
diff --git a/net-dialup/rp-pppoe/ChangeLog b/net-dialup/rp-pppoe/ChangeLog
index 3fe776bfd2af..2d364ef13003 100644
--- a/net-dialup/rp-pppoe/ChangeLog
+++ b/net-dialup/rp-pppoe/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-dialup/rp-pppoe
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/ChangeLog,v 1.67 2006/03/22 22:09:50 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/ChangeLog,v 1.68 2006/04/01 07:53:24 mrness Exp $
+
+ 01 Apr 2006; Alin Nastac <mrness@gentoo.org> rp-pppoe-3.7.ebuild:
+ Bail out in pkg_setup if the old /etc/init.d/rp-pppoe still exist.
22 Mar 2006; Michael Hanselmann <hansmi@gentoo.org> rp-pppoe-3.7.ebuild:
Stable on ppc.
diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.7.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.7.ebuild
index cef47e21209f..5de6fe38fd69 100644
--- a/net-dialup/rp-pppoe/rp-pppoe-3.7.ebuild
+++ b/net-dialup/rp-pppoe/rp-pppoe-3.7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/rp-pppoe-3.7.ebuild,v 1.5 2006/03/22 22:09:50 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/rp-pppoe-3.7.ebuild,v 1.6 2006/04/01 07:53:24 mrness Exp $
inherit eutils flag-o-matic
@@ -17,6 +17,19 @@ IUSE="X"
DEPEND="net-dialup/ppp
X? ( dev-lang/tk )"
+pkg_setup() {
+ einfo "Gentoo is moving toward common configuration file for all network interfaces."
+ einfo "Please use baselayout adsl module for configuring your network using rp-pppoe"
+ einfo "or, better yet, use generic PPP support available in baselayout-1.12."
+
+ if [[ -x "${ROOT}/etc/init.d/rp-pppoe" ]]; then
+ echo
+ eerror "The old /etc/init.d/rp-pppoe script is incompatible with ${CATEGORY}/${P} and"
+ eerror "it should be removed before you could upgrade this package."
+ die "Unsupported old init script detected"
+ fi
+}
+
src_unpack() {
unpack ${A} || die "failed to unpack"