summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2008-02-24 11:38:13 +0000
committerMike Frysinger <vapier@gentoo.org>2008-02-24 11:38:13 +0000
commit0b3e47dd96d0cc795ad95792b0bd4d31ed15fb0f (patch)
tree72824c09227aacb0ee968eb1821930b102810cf1 /sys-libs
parentx86 stable, bug #210840 (diff)
downloadgentoo-2-0b3e47dd96d0cc795ad95792b0bd4d31ed15fb0f.tar.gz
gentoo-2-0b3e47dd96d0cc795ad95792b0bd4d31ed15fb0f.tar.bz2
gentoo-2-0b3e47dd96d0cc795ad95792b0bd4d31ed15fb0f.zip
Add workaround for FEATURES=unmerge-orphans and upgrading from older versions #195017 by Pacho Ramos.
(Portage version: 2.2_pre2)
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/cracklib/ChangeLog6
-rw-r--r--sys-libs/cracklib/cracklib-2.8.12.ebuild11
2 files changed, 15 insertions, 2 deletions
diff --git a/sys-libs/cracklib/ChangeLog b/sys-libs/cracklib/ChangeLog
index d57729f97d67..b8c4dfe0fdd5 100644
--- a/sys-libs/cracklib/ChangeLog
+++ b/sys-libs/cracklib/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-libs/cracklib
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/ChangeLog,v 1.119 2008/02/14 13:12:49 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/ChangeLog,v 1.120 2008/02/24 11:38:13 vapier Exp $
+
+ 24 Feb 2008; Mike Frysinger <vapier@gentoo.org> cracklib-2.8.12.ebuild:
+ Add workaround for FEATURES=unmerge-orphans and upgrading from older
+ versions #195017 by Pacho Ramos.
14 Feb 2008; Jeroen Roovers <jer@gentoo.org> cracklib-2.8.12.ebuild:
Stable for HPPA (bug #209064).
diff --git a/sys-libs/cracklib/cracklib-2.8.12.ebuild b/sys-libs/cracklib/cracklib-2.8.12.ebuild
index 48d9105a4e73..90bcd11f4424 100644
--- a/sys-libs/cracklib/cracklib-2.8.12.ebuild
+++ b/sys-libs/cracklib/cracklib-2.8.12.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.8.12.ebuild,v 1.7 2008/02/24 09:12:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.8.12.ebuild,v 1.8 2008/02/24 11:38:13 vapier Exp $
inherit toolchain-funcs multilib
@@ -18,6 +18,15 @@ DEPEND="python? ( dev-lang/python )"
S=${WORKDIR}/${MY_P}
+pkg_setup() {
+ # workaround #195017
+ if has unmerge-orphans ${FEATURES} && has_version "<${CATEGORY}/${PN}-2.8.10" ; then
+ eerror "Upgrade path is broken with FEATURES=unmerge-orphans"
+ eerror "Please run: FEATURES=-unmerge-orphans emerge cracklib"
+ die "Please run: FEATURES=-unmerge-orphans emerge cracklib"
+ fi
+}
+
src_compile() {
econf \
--with-default-dict='$(libdir)/cracklib_dict' \