diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2008-02-24 11:38:13 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2008-02-24 11:38:13 +0000 |
| commit | b4d52145680cc3df61709b529ab6c61b301e9541 (patch) | |
| tree | fc5abab762c13b66c591159229ea7712baf334fd /sys-libs | |
| parent | x86 stable, bug #210840 (diff) | |
| download | historical-b4d52145680cc3df61709b529ab6c61b301e9541.tar.gz historical-b4d52145680cc3df61709b529ab6c61b301e9541.tar.bz2 historical-b4d52145680cc3df61709b529ab6c61b301e9541.zip | |
Add workaround for FEATURES=unmerge-orphans and upgrading from older versions #195017 by Pacho Ramos.
Package-Manager: portage-2.2_pre2
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/cracklib/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-libs/cracklib/Manifest | 10 | ||||
| -rw-r--r-- | sys-libs/cracklib/cracklib-2.8.12.ebuild | 11 |
3 files changed, 20 insertions, 7 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/Manifest b/sys-libs/cracklib/Manifest index 8be20ff64ca2..9dae8315deed 100644 --- a/sys-libs/cracklib/Manifest +++ b/sys-libs/cracklib/Manifest @@ -6,14 +6,14 @@ DIST cracklib-2.8.10.tar.gz 577598 RMD160 9b01f2320b540f32df16c0308145ee84d6d6ab DIST cracklib-2.8.12.tar.gz 585981 RMD160 91649e66c3ce491b2ebea6135eaa6ba4705ffb58 SHA1 0a77b21366cfbad675e6e44642026c89b87f41ce SHA256 50d55cc6e541324533f67d2668fd87a84d29805ddf379286de7302044f563351 DIST cracklib-2.8.9.tar.gz 575494 RMD160 97e36e1bc114ef74fae7feeb0701a7ef8ffe9a3e SHA1 22cc3c5ba5251771b3ba037d5dc8e87d17295f72 SHA256 1b58c9b03733ca4f58e417ea8bba8e1a335d2d0bf0a99caa414d0f07a9f6b7e6 EBUILD cracklib-2.8.10.ebuild 1307 RMD160 c22f15572fad3e5150f3978a19e24ba370079df9 SHA1 25b8d3af64d97673b1df83c583316c609aee94f5 SHA256 6ff33a62a695ffda05dcf84dff75eaeb15dd4a18fa3f19acf006563e8250b78a -EBUILD cracklib-2.8.12.ebuild 1307 RMD160 013fcae91f4b3875d0d9c5e3ac0b78b4b2fc01f9 SHA1 f6d20ade6fd099bb279b8e3bb7b9ee9213989f6d SHA256 3fcddd454b3bb53f9a6927b1a3955a7b1e65efa2cde55019428e700f17792202 +EBUILD cracklib-2.8.12.ebuild 1627 RMD160 f7c9406286c94e79c6fa2ca3c0a78481cfe52dc5 SHA1 7925f0d1e30c2f60192257170f0c23410577dd2a SHA256 26cfacc1dba9976ea06261d6b50510a6ee5d086db71cfad9efca8d2bc9861c29 EBUILD cracklib-2.8.9-r1.ebuild 1406 RMD160 dc2fe1a1b808dbf18a3436226146d4db352ff9ab SHA1 4de796b9bc14d6a108e6dd917728304cd498638b SHA256 f833a801028a9f8ebbb4bb8cb5e287b21b2561cb5e5adbcd67687d534029b863 -MISC ChangeLog 15032 RMD160 eb9d0d85077e20d9657e6ec027e3e4db1a587fde SHA1 5c4a1dfd5993f2fdee819398df4120cb220490b1 SHA256 7ede1c1e523ecff1a37fe517c8da45ceb3027691d4aa4b4655a5872245c6331b +MISC ChangeLog 15216 RMD160 d0b2c7e99ee939c118904b5914222096465ee643 SHA1 7ce902ec7e0605115e9ea4cfd61de3d3e7385cd5 SHA256 16b2d2633fbaad811a107925be26bdb0a8b3f46dddb36f93e8b17f6486acde67 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.7 (GNU/Linux) -iD8DBQFHwTUZj9hvisErhMIRAmryAKChM0grltU5i74mCRGIE8dkXWLUeQCgkZJy -tBHP8tS37qeO5jH4TlQngx8= -=xTdG +iD8DBQFHwVcrj9hvisErhMIRAp48AKDjuv8lm0UEoTZt95zguKpl7REcqQCfRSVN +kn8ejgM/M915bVI76zQ/x1w= +=bADR -----END PGP SIGNATURE----- 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' \ |