diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2010-03-24 19:30:13 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2010-03-24 19:30:13 +0000 |
| commit | 3b191e4d59c694a628f84084363db3081574bfa6 (patch) | |
| tree | ef1725dc36bc32ec3843ca991127c6213d064b0d /app-arch | |
| parent | stable x86, bug 311105 (diff) | |
| download | gentoo-2-3b191e4d59c694a628f84084363db3081574bfa6.tar.gz gentoo-2-3b191e4d59c694a628f84084363db3081574bfa6.tar.bz2 gentoo-2-3b191e4d59c694a628f84084363db3081574bfa6.zip | |
Make building dselect optional and dependent on USE=nls thanks to Neil Bothwick (bug #311165).
(Portage version: 2.2_rc67/cvs/Linux i686)
Diffstat (limited to 'app-arch')
| -rw-r--r-- | app-arch/dpkg/ChangeLog | 7 | ||||
| -rw-r--r-- | app-arch/dpkg/dpkg-1.15.6.ebuild | 15 | ||||
| -rw-r--r-- | app-arch/dpkg/metadata.xml | 3 |
3 files changed, 21 insertions, 4 deletions
diff --git a/app-arch/dpkg/ChangeLog b/app-arch/dpkg/ChangeLog index 1e561d539d6e..62788387c351 100644 --- a/app-arch/dpkg/ChangeLog +++ b/app-arch/dpkg/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-arch/dpkg # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/ChangeLog,v 1.122 2010/03/24 05:40:11 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/ChangeLog,v 1.123 2010/03/24 19:30:13 jer Exp $ + + 24 Mar 2010; Jeroen Roovers <jer@gentoo.org> dpkg-1.15.6.ebuild, + metadata.xml: + Make building dselect optional and dependent on USE=nls thanks to Neil + Bothwick (bug #311165). 24 Mar 2010; Jeroen Roovers <jer@gentoo.org> dpkg-1.15.6.ebuild: Disable Dpkg::Compression::FileHandle test for this version (bug #310847). diff --git a/app-arch/dpkg/dpkg-1.15.6.ebuild b/app-arch/dpkg/dpkg-1.15.6.ebuild index 62d00171acbb..2fca3376ec75 100644 --- a/app-arch/dpkg/dpkg-1.15.6.ebuild +++ b/app-arch/dpkg/dpkg-1.15.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.15.6.ebuild,v 1.4 2010/03/24 05:40:11 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.15.6.ebuild,v 1.5 2010/03/24 19:30:13 jer Exp $ EAPI=3 @@ -13,7 +13,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris" -IUSE="bzip2 nls test unicode zlib" +IUSE="bzip2 dselect nls test unicode zlib" LANGS="sv de es ja fr hu pl ru" @@ -50,9 +50,18 @@ src_prepare() { } src_configure() { + local myconf + if use nls; then + myconf="--enable-nls $(use_with dselect)" + else + if use dselect; then + elog "Building dselect requires USE=nls - disabling USE=dselect..." + fi + myconf="--disable-nls --without-dselect" + fi econf \ + ${myconf} \ $(use_with bzip2 bz2) \ - $(use_enable nls) \ $(use_enable unicode) \ $(use_with zlib) \ --without-selinux \ diff --git a/app-arch/dpkg/metadata.xml b/app-arch/dpkg/metadata.xml index 13183a3d7070..7ac2656a4029 100644 --- a/app-arch/dpkg/metadata.xml +++ b/app-arch/dpkg/metadata.xml @@ -2,4 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <herd>deb-tools</herd> +<use> +<flag name="dselect">Build the dselect package-management frontend</flag> +</use> </pkgmetadata> |