diff options
| author |   Steven J Newbury <steve@snewbury.org.uk> | 2009-04-08 02:00:47 +0100 |
|---|---|---|
| committer | Steven J Newbury <steve@snewbury.org.uk> | 2009-04-08 02:00:47 +0100 |
| commit | 4c90c84c3910dd9cf44cb23c75eb3524e65b0942 (patch) | |
| tree | b7699736d080af3662022f06b72ed17e27fb25a2 | |
| parent | Update sys-libs/db: Use MULTILIB_IN_SOURCE_BUILD, convert (diff) | |
| download | multilib-portage-4c90c84c3910dd9cf44cb23c75eb3524e65b0942.tar.gz multilib-portage-4c90c84c3910dd9cf44cb23c75eb3524e65b0942.tar.bz2 multilib-portage-4c90c84c3910dd9cf44cb23c75eb3524e65b0942.zip | |
Update dev-libs/libpcre: Add deps on zlib and bzip2 as well as make
EAPI-2 compliant
| -rw-r--r-- | dev-libs/libpcre/Manifest | 4 | ||||
| -rw-r--r-- | dev-libs/libpcre/libpcre-7.7-r1.ebuild | 17 | ||||
| -rw-r--r-- | dev-libs/libpcre/libpcre-7.8.ebuild | 17 |
3 files changed, 18 insertions, 20 deletions
diff --git a/dev-libs/libpcre/Manifest b/dev-libs/libpcre/Manifest index bec170322..71426ae9b 100644 --- a/dev-libs/libpcre/Manifest +++ b/dev-libs/libpcre/Manifest @@ -1,7 +1,7 @@ AUX libpcre-7.7-buffer-overflow.patch 636 RMD160 49538a7ec5a6defe4dbe56d0dee6ec645e823545 SHA1 5a69fb97f1fa547f9012082221a6b98d77b65277 SHA256 cb35a6f7b28f3d0525710a692066b0b4fedc8c31160ab6c7d322309ac68ce3f8 DIST pcre-7.7.tar.bz2 818897 RMD160 fdf7785b982879ce91847130960fa1531caffaeb SHA1 f1f54d3e13e6cb427de962e62eaaee32c74cba38 SHA256 bada84f483b428bb45ee68899b62c996f03e8c9422408fc72e60ec854c9df640 DIST pcre-7.8.tar.bz2 840922 RMD160 f8cc336f984bce9bfebaef27e6376d84845bce8f SHA1 552909f9d18e1954eec639f926957a4cb2de1ec3 SHA256 795f3c2ae29339e633a4dac7b596d6cd4d86504befbe951c9d5ff42aca9858ff -EBUILD libpcre-7.7-r1.ebuild 1476 RMD160 5f385dde1aae2dff7da8229883b7a2fde79154b6 SHA1 6f358f43c6041aa549e9485173e041ef04d01a5e SHA256 34bb25f6b44b0bff61b9cec9a9580634e3f0396c38f68a4d30fa39d58c4860ad -EBUILD libpcre-7.8.ebuild 1424 RMD160 4749a1ae7f08b7f59932df10c5867c9371c57a96 SHA1 2c2adde622a6dff552172aa582a391adbf377c64 SHA256 d6956933cb67bde087cbe7c6a5cdba4f9648c6fd8e8dac1412397e97d56afaf9 +EBUILD libpcre-7.7-r1.ebuild 1502 RMD160 52edba5c6b98a47710ea19bb383cce2b6e5b302d SHA1 d7483e81c5a370970583a1f99925fc7891751f7e SHA256 e613e0e2836bdd991d311bddb4a75174ead08db2b2294d72b7183f8416ab382d +EBUILD libpcre-7.8.ebuild 1450 RMD160 8bcd1e861266fe1f7816087e9065cc397a6295e9 SHA1 3caae5b9166a45e0916c97c4801b164d3b91d523 SHA256 0e4fd83ebfdacd6821ce5015382f711c67844ec7f77954eb6c03423062f88069 MISC ChangeLog 18561 RMD160 5f7ec73ca5cbf5d7fdf7deb44bd9bc1fcec80524 SHA1 8084ec8281bf5e03bb13d77baf5264de03f6a3df SHA256 0d257850129d02b682b09aa6a842f9d286e231e9e79f2a0ab66daba9bba29462 MISC metadata.xml 306 RMD160 828e2a0aae05636e0341c95770549c8901e891d9 SHA1 a7ab5b463baa92c0540fb4f4013674a243ca922b SHA256 6c64b79712509179600cae5676df6460f166225ee0f9a10aafe494fde9a8ccb1 diff --git a/dev-libs/libpcre/libpcre-7.7-r1.ebuild b/dev-libs/libpcre/libpcre-7.7-r1.ebuild index 78f7a4446..84da9c447 100644 --- a/dev-libs/libpcre/libpcre-7.7-r1.ebuild +++ b/dev-libs/libpcre/libpcre-7.7-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-7.7-r1.ebuild,v 1.2 2008/11/05 00:33:31 vapier Exp $ @@ -17,21 +17,21 @@ SLOT="3" KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd" IUSE="bzip2 +cxx doc unicode zlib" -DEPEND="dev-util/pkgconfig" -RDEPEND="" +DEPEND="dev-util/pkgconfig + sys-libs/zlib[lib32?] + app-arch/bzip2[lib32?]" +RDEPEND="sys-libs/zlib[lib32?] + app-arch/bzip2[lib32?]" S=${WORKDIR}/${MY_P} -src_unpack() { - unpack ${A} +src_prepare() { cd "${S}" epatch "${FILESDIR}"/${P}-buffer-overflow.patch elibtoolize } -src_configure() { :; } - -multilib-native_src_compile_internal() { +multilib-native_src_configure_internal() { # Enable building of static libs too - grep and others # depend on them being built: bug 164099 econf --with-match-limit-recursion=8192 \ @@ -43,7 +43,6 @@ multilib-native_src_compile_internal() { --htmldir=/usr/share/doc/${PF}/html \ --docdir=/usr/share/doc/${PF} \ || die "econf failed" - emake all || die "emake failed" } multilib-native_src_install_internal() { diff --git a/dev-libs/libpcre/libpcre-7.8.ebuild b/dev-libs/libpcre/libpcre-7.8.ebuild index e968b9e91..110464a94 100644 --- a/dev-libs/libpcre/libpcre-7.8.ebuild +++ b/dev-libs/libpcre/libpcre-7.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-7.8.ebuild,v 1.7 2008/11/05 00:33:31 vapier Exp $ @@ -17,20 +17,20 @@ SLOT="3" KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd" IUSE="bzip2 +cxx doc unicode zlib" -DEPEND="dev-util/pkgconfig" -RDEPEND="" +DEPEND="dev-util/pkgconfig + sys-libs/zlib[lib32?] + app-arch/bzip2[lib32?]" +RDEPEND="sys-libs/zlib[lib32?] + app-arch/bzip2[lib32?]" S=${WORKDIR}/${MY_P} -src_unpack() { - unpack ${A} +src_prepare() { cd "${S}" elibtoolize } -src_configure() { :; } - -multilib-native_src_compile_internal() { +multilib-native_src_configure_internal() { # Enable building of static libs too - grep and others # depend on them being built: bug 164099 econf --with-match-limit-recursion=8192 \ @@ -42,7 +42,6 @@ multilib-native_src_compile_internal() { --htmldir=/usr/share/doc/${PF}/html \ --docdir=/usr/share/doc/${PF} \ || die "econf failed" - emake all || die "emake failed" } multilib-native_src_install_internal() { |