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 | 97213581335f9c0b9cd15bd0a463cc50c6b658c7 (patch) | |
| tree | 3d8a9ac53594b94a5d8d56963ad9912a42fdd2e8 /app-arch | |
| parent | stable x86, bug 311105 (diff) | |
| download | historical-97213581335f9c0b9cd15bd0a463cc50c6b658c7.tar.gz historical-97213581335f9c0b9cd15bd0a463cc50c6b658c7.tar.bz2 historical-97213581335f9c0b9cd15bd0a463cc50c6b658c7.zip | |
Make building dselect optional and dependent on USE=nls thanks to Neil Bothwick (bug #311165).
Package-Manager: portage-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/Manifest | 6 | ||||
| -rw-r--r-- | app-arch/dpkg/dpkg-1.15.6.ebuild | 15 | ||||
| -rw-r--r-- | app-arch/dpkg/metadata.xml | 3 |
4 files changed, 24 insertions, 7 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/Manifest b/app-arch/dpkg/Manifest index aaac1be1b625..4fe70c23ba88 100644 --- a/app-arch/dpkg/Manifest +++ b/app-arch/dpkg/Manifest @@ -10,6 +10,6 @@ EBUILD dpkg-1.15.2.ebuild 1486 RMD160 07cfabb8729e9d7e024c5605e2818eebce031c3f S EBUILD dpkg-1.15.5.5.ebuild 1657 RMD160 2bc0c9486eb0dbab4d5ac4d4db414822c2a83d08 SHA1 9c8e30450f70a6761e461fb0a55664d5493203b1 SHA256 d8941c1b5abc2cdc0dc0a3a0845e99dd86bf86f8d5eb98cfaf220979633f95aa EBUILD dpkg-1.15.5.6-r1.ebuild 2057 RMD160 d5f19fabe5759eaf378ce9d627dfe2443e3fc622 SHA1 d213c3a43bc37305f26eb58da1f496bca19536f0 SHA256 b6e7d60085cbed2a271a0ca97d5f9a0e30f5fa290d5d5e1ad2364c74a2152890 EBUILD dpkg-1.15.5.6.ebuild 1667 RMD160 370ee9024598ab486bb9b0c924644cd73fcbbf5e SHA1 f25f1d553a39c546d9a20fcf843223b3c68c5b8f SHA256 7571e53e0ced6ebbdda2c108a338ed5c8b421c2c217f4d55b4168a22914ff1b1 -EBUILD dpkg-1.15.6.ebuild 2117 RMD160 5f677adcbca282b18d516f758967d5ad1da8ca9c SHA1 2da86b6044ef5c5c37b898db87a60e7c99785a41 SHA256 f071ce09e1f5549825fe0c3f27eb4735d5668a976ca2b46ceac664d8ac601909 -MISC ChangeLog 16586 RMD160 3e82170c4feba0cd6a9bbd56244513e7641de9f5 SHA1 d50c711b5eb2c4296aeab292949c175cb98151da SHA256 075a8d54e08739891a555ba426fe72ef9b7f354a9f6b4ea33b6ed6da778e7b87 -MISC metadata.xml 162 RMD160 ebe445a93e16f05a392ebdf3882b56b92931e37e SHA1 8bc26eb7c98535f3e31d2288f25fba83838857e5 SHA256 316a32c1e8ee9f6548707abec9a803d0a19feea1be10a19273cc04e0cd357644 +EBUILD dpkg-1.15.6.ebuild 2345 RMD160 18f70af4747549213a6a462024c0f228f95aaa58 SHA1 3d197b90e1fbee789730735569fbbaac00afba58 SHA256 f4dbc5398661b28382f8e7eb3da10b82a931032f4a49a795d2f370f6dfa2a827 +MISC ChangeLog 16769 RMD160 e03e8fd5496e0796243648aaf79bbd466bb1c5f9 SHA1 5b3e2ed7a0348e0cfcbfc3b1985c244febcb3e86 SHA256 e6719328645cf19d0dd655f168bfd049a71c17cf3c86887cbcfeb13ca9a330b6 +MISC metadata.xml 249 RMD160 91de35e671db35d8e1c3fe50177b6ec889466712 SHA1 d6956b17015162642aa95088fc3abbaee87d69d3 SHA256 d6077d4b746902b16a584be1c22f32bd2f88f2f5eff566ba8fb7b0b78a6827b7 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> |