diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-07-20 16:36:42 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-07-20 16:36:42 +0000 |
| commit | e6fe1a846c27dc0781a3526bfa964c65b535e072 (patch) | |
| tree | c0a414b6dc271076c07e29e2dd87e130f9684504 | |
| parent | Drop nautilus use flag from metadata. (diff) | |
| download | gentoo-2-e6fe1a846c27dc0781a3526bfa964c65b535e072.tar.gz gentoo-2-e6fe1a846c27dc0781a3526bfa964c65b535e072.tar.bz2 gentoo-2-e6fe1a846c27dc0781a3526bfa964c65b535e072.zip | |
Force recent enough sys-libs/zlib for zlib.pc pkg-config file to be present wrt #427130 by Nick Bowler
(Portage version: 2.2.0_alpha116/cvs/Linux x86_64)
| -rw-r--r-- | sys-apps/kmod/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-apps/kmod/kmod-9-r3.ebuild | 10 | ||||
| -rw-r--r-- | sys-apps/kmod/kmod-9999.ebuild | 10 |
3 files changed, 10 insertions, 17 deletions
diff --git a/sys-apps/kmod/ChangeLog b/sys-apps/kmod/ChangeLog index d336b512af41..c2cee2f5e8f0 100644 --- a/sys-apps/kmod/ChangeLog +++ b/sys-apps/kmod/ChangeLog @@ -1,5 +1,10 @@ # ChangeLog for sys-apps/kmod -# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.45 2012/07/17 15:48:42 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.46 2012/07/20 16:36:42 ssuominen Exp $ + + 20 Jul 2012; Samuli Suominen <ssuominen@gentoo.org> kmod-9-r3.ebuild, + kmod-9999.ebuild: + Force recent enough sys-libs/zlib for zlib.pc pkg-config file to be present + wrt #427130 by Nick Bowler 17 Jul 2012; William Hubbs <williamh@gentoo.org> -kmod-9-r2.ebuild: remove broken version diff --git a/sys-apps/kmod/kmod-9-r3.ebuild b/sys-apps/kmod/kmod-9-r3.ebuild index 90a420d33f67..8032b7856470 100644 --- a/sys-apps/kmod/kmod-9-r3.ebuild +++ b/sys-apps/kmod/kmod-9-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9-r3.ebuild,v 1.1 2012/07/17 12:30:36 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9-r3.ebuild,v 1.2 2012/07/20 16:36:42 ssuominen Exp $ EAPI=4 @@ -25,7 +25,7 @@ IUSE="debug doc lzma static-libs +tools zlib" RDEPEND="!sys-apps/module-init-tools !sys-apps/modutils lzma? ( app-arch/xz-utils ) - zlib? ( sys-libs/zlib )" + zlib? ( >=sys-libs/zlib-1.2.6 )" #427130 DEPEND="${RDEPEND} doc? ( dev-util/gtk-doc ) lzma? ( virtual/pkgconfig ) @@ -53,12 +53,6 @@ src_prepare() src_configure() { - # http://bugs.gentoo.org/410865 - if has_version '<sys-libs/zlib-1.2.6'; then - export zlib_CFLAGS="-I/usr/include" - export zlib_LIBS="-lz" - fi - econf \ $(use_enable static-libs static) \ $(use_enable tools) \ diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild index 8f354b303ba8..a184c7bf4ce7 100644 --- a/sys-apps/kmod/kmod-9999.ebuild +++ b/sys-apps/kmod/kmod-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.30 2012/07/17 12:36:53 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.31 2012/07/20 16:36:42 ssuominen Exp $ EAPI=4 @@ -25,7 +25,7 @@ IUSE="debug doc lzma static-libs +tools zlib" RDEPEND="!sys-apps/module-init-tools !sys-apps/modutils lzma? ( app-arch/xz-utils ) - zlib? ( sys-libs/zlib )" + zlib? ( >=sys-libs/zlib-1.2.6 )" #427130 DEPEND="${RDEPEND} doc? ( dev-util/gtk-doc ) lzma? ( virtual/pkgconfig ) @@ -53,12 +53,6 @@ src_prepare() src_configure() { - # http://bugs.gentoo.org/410865 - if has_version '<sys-libs/zlib-1.2.6'; then - export zlib_CFLAGS="-I/usr/include" - export zlib_LIBS="-lz" - fi - econf \ $(use_enable static-libs static) \ $(use_enable tools) \ |