From 5bf049f1e3cc1dcae98655a94e5f02fb99884cce Mon Sep 17 00:00:00 2001 From: Renat Lumpau Date: Sat, 1 Jul 2006 19:53:54 +0000 Subject: Fix sys-libs/db stuff, bug #135766. Package-Manager: portage-2.1 --- app-admin/webalizer/ChangeLog | 5 ++- app-admin/webalizer/Manifest | 44 ++++++++++++------------ app-admin/webalizer/webalizer-2.01.10-r13.ebuild | 14 ++++---- 3 files changed, 33 insertions(+), 30 deletions(-) (limited to 'app-admin') diff --git a/app-admin/webalizer/ChangeLog b/app-admin/webalizer/ChangeLog index 0c7456904695..be90e865942a 100644 --- a/app-admin/webalizer/ChangeLog +++ b/app-admin/webalizer/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-admin/webalizer # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/ChangeLog,v 1.56 2006/04/24 15:46:58 rl03 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/ChangeLog,v 1.57 2006/07/01 19:53:54 rl03 Exp $ + + 01 Jul 2006; Renat Lumpau webalizer-2.01.10-r13.ebuild: + Fix sys-libs/db stuff, bug #135766. 24 Apr 2006; Renat Lumpau -files/2.01.10/apache.webalizer, -files/2.01.10/reconfig, diff --git a/app-admin/webalizer/Manifest b/app-admin/webalizer/Manifest index c5eba3e6b1a5..c88364c5404d 100644 --- a/app-admin/webalizer/Manifest +++ b/app-admin/webalizer/Manifest @@ -1,40 +1,40 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX apache.webalizer 298 RMD160 46e6b80f0ab978b07af624cc099db56cf72806bc SHA1 5242a3d716b8f4eb48cbbc72d55186ba10759c99 SHA256 c94d63121e8a1860f4fa8a8499c3678351eaee721bbe24ea50cf2552b176f568 size 298 +AUX apache.webalizer 298 RMD160 46e6b80f0ab978b07af624cc099db56cf72806bc SHA1 5242a3d716b8f4eb48cbbc72d55186ba10759c99 SHA256 c94d63121e8a1860f4fa8a8499c3678351eaee721bbe24ea50cf2552b176f568 MD5 b8782062aca52fcaa8229b1cbcca5d60 files/apache.webalizer 298 RMD160 46e6b80f0ab978b07af624cc099db56cf72806bc files/apache.webalizer 298 SHA256 c94d63121e8a1860f4fa8a8499c3678351eaee721bbe24ea50cf2552b176f568 files/apache.webalizer 298 -AUX webalizer-db4.2.patch 552 RMD160 bf9703f3713b53a97fd04ee372d55d17c17e70c0 SHA1 5255795f599f792c0373e4cc933d42189a6e57bd SHA256 51c12d7469d455842a2f9b223e8c27e1ea99a97e0a0ddb490844a80df44cf309 size 552 +AUX webalizer-db4.2.patch 552 RMD160 bf9703f3713b53a97fd04ee372d55d17c17e70c0 SHA1 5255795f599f792c0373e4cc933d42189a6e57bd SHA256 51c12d7469d455842a2f9b223e8c27e1ea99a97e0a0ddb490844a80df44cf309 MD5 ff6044f61cca31af6541dc7ee28affd9 files/webalizer-db4.2.patch 552 RMD160 bf9703f3713b53a97fd04ee372d55d17c17e70c0 files/webalizer-db4.2.patch 552 SHA256 51c12d7469d455842a2f9b223e8c27e1ea99a97e0a0ddb490844a80df44cf309 files/webalizer-db4.2.patch 552 -AUX webalizer-language-list.txt 1520 RMD160 27d981a14e0bab35b036f386c3d2e716d3b29455 SHA1 0563e9b42eb63ca24d6dacf48126f0a9ec1a5a16 SHA256 9b946e766fdecccbbd480f520bd610afad78316aba4e7e0cea237da43039efd4 size 1520 +AUX webalizer-language-list.txt 1520 RMD160 27d981a14e0bab35b036f386c3d2e716d3b29455 SHA1 0563e9b42eb63ca24d6dacf48126f0a9ec1a5a16 SHA256 9b946e766fdecccbbd480f520bd610afad78316aba4e7e0cea237da43039efd4 MD5 94e47e69398034261ac6d26edab9eafb files/webalizer-language-list.txt 1520 RMD160 27d981a14e0bab35b036f386c3d2e716d3b29455 files/webalizer-language-list.txt 1520 SHA256 9b946e766fdecccbbd480f520bd610afad78316aba4e7e0cea237da43039efd4 files/webalizer-language-list.txt 1520 -AUX webalizer-readability.patch 8345 RMD160 45a75b03752370f9ddb818768ff0730ad829fe64 SHA1 b9515b7ed9585c8bd63d8cd3de02d3045044a975 SHA256 7b89611bccaf9f9b8abf824e270e6ffa4d5447080f1685cfce0ab3a23f2f3314 size 8345 +AUX webalizer-readability.patch 8345 RMD160 45a75b03752370f9ddb818768ff0730ad829fe64 SHA1 b9515b7ed9585c8bd63d8cd3de02d3045044a975 SHA256 7b89611bccaf9f9b8abf824e270e6ffa4d5447080f1685cfce0ab3a23f2f3314 MD5 766a26ff1600e3ea5359278a9dcd1025 files/webalizer-readability.patch 8345 RMD160 45a75b03752370f9ddb818768ff0730ad829fe64 files/webalizer-readability.patch 8345 SHA256 7b89611bccaf9f9b8abf824e270e6ffa4d5447080f1685cfce0ab3a23f2f3314 files/webalizer-readability.patch 8345 -DIST geolizer_2.01-10-patch.20050520.tar.bz2 35836 RMD160 b4abd8498b64c0298e6875ee802cdbeec9086806 SHA256 0914ec2a2401e8f8ae2735984d18714f5331d864c03347ca56ac3c22fb860378 size 35836 -DIST webalizer-2.01-10-RB07-patch.tar.gz 7778 RMD160 d7a0e672f5817a6a719b13a3dd46999cd6f3b7df SHA256 b7318aa386a26964aade84b56346d3ffddec8192a03933556c75cbf3a5b1cdc0 size 7778 -DIST webalizer-2.01-10-src.tar.bz2 252664 RMD160 4605ff9bd8ec1c74680b8fbfe703f2e81ae68e20 SHA256 f339e4b8879aeade0f889b7bc7eb85854a7746a16b267c4aa985cd5b8a112262 size 252664 -DIST webalizer-search.patch.gz 6424 RMD160 1db8210754f7b7f4fe49d99d51f01b5e7fbb3d13 SHA256 0d9bd3adb4c3e571a9231f0f1a6d689851ff53ffdad9c0e6e3e4e495ff709360 size 6424 -DIST webalizer.conf.gz 8986 RMD160 61751fa52c4e4bc29a8c3ba5956daf0a45138ec5 SHA256 b7da31865a8c13a66756247d68242d6478900f2c2b9b5698ed35c0c613fb9a71 size 8986 -EBUILD webalizer-2.01.10-r12.ebuild 4337 RMD160 7bfeeb95998cc65a60808e28ad6b80153a0ee407 SHA1 96c763cec57d6f5faae2b1e684e970ddd97b3b8c SHA256 0956653d64338905496851de718b32c37ee965899404ccb7902f97872fec4caa size 4337 +DIST geolizer_2.01-10-patch.20050520.tar.bz2 35836 RMD160 b4abd8498b64c0298e6875ee802cdbeec9086806 SHA1 61adea1082dee6ab683c0ffde48ea73897e540fc SHA256 0914ec2a2401e8f8ae2735984d18714f5331d864c03347ca56ac3c22fb860378 +DIST webalizer-2.01-10-RB07-patch.tar.gz 7778 RMD160 d7a0e672f5817a6a719b13a3dd46999cd6f3b7df SHA1 51dadd3f8f269e95828c393ca8e3c48f3f8113b7 SHA256 b7318aa386a26964aade84b56346d3ffddec8192a03933556c75cbf3a5b1cdc0 +DIST webalizer-2.01-10-src.tar.bz2 252664 RMD160 4605ff9bd8ec1c74680b8fbfe703f2e81ae68e20 SHA1 fbf6ad78fc2b0189d065e661dc02a781e858b31a SHA256 f339e4b8879aeade0f889b7bc7eb85854a7746a16b267c4aa985cd5b8a112262 +DIST webalizer-search.patch.gz 6424 RMD160 1db8210754f7b7f4fe49d99d51f01b5e7fbb3d13 SHA1 fe555842f1b199bc16c3941187b04fdd3c2ebda6 SHA256 0d9bd3adb4c3e571a9231f0f1a6d689851ff53ffdad9c0e6e3e4e495ff709360 +DIST webalizer.conf.gz 8986 RMD160 61751fa52c4e4bc29a8c3ba5956daf0a45138ec5 SHA1 557406236b10630fb213b12ef30c810a76eac6e5 SHA256 b7da31865a8c13a66756247d68242d6478900f2c2b9b5698ed35c0c613fb9a71 +EBUILD webalizer-2.01.10-r12.ebuild 4337 RMD160 7bfeeb95998cc65a60808e28ad6b80153a0ee407 SHA1 96c763cec57d6f5faae2b1e684e970ddd97b3b8c SHA256 0956653d64338905496851de718b32c37ee965899404ccb7902f97872fec4caa MD5 4a17f242d138145246866fc6c0cf5f17 webalizer-2.01.10-r12.ebuild 4337 RMD160 7bfeeb95998cc65a60808e28ad6b80153a0ee407 webalizer-2.01.10-r12.ebuild 4337 SHA256 0956653d64338905496851de718b32c37ee965899404ccb7902f97872fec4caa webalizer-2.01.10-r12.ebuild 4337 -EBUILD webalizer-2.01.10-r13.ebuild 4466 RMD160 7ca41692205e892633120c78d6528d29f42d0d2b SHA1 4136384f131682458200cece45096fa2bd876ffa SHA256 021b4ca60da3aed4fb06002e83a0c5a80c50bc11f5e3f022e4c8f3e27e1a0020 size 4466 -MD5 8a20e5657372637a8875c2d6540cde00 webalizer-2.01.10-r13.ebuild 4466 -RMD160 7ca41692205e892633120c78d6528d29f42d0d2b webalizer-2.01.10-r13.ebuild 4466 -SHA256 021b4ca60da3aed4fb06002e83a0c5a80c50bc11f5e3f022e4c8f3e27e1a0020 webalizer-2.01.10-r13.ebuild 4466 -MISC ChangeLog 8315 RMD160 7fd7120c03e987317cf57374078075df5c4e6f8d SHA1 1bf7448c43a9c629c60d52ab9ea1adedd1718238 SHA256 acd739c2cc875675b3679e53811dc4bec96bd082e0a2586382f8913bc11df2fe size 8315 -MD5 9c20d80642ea4bfe4b0a76000d4681d8 ChangeLog 8315 -RMD160 7fd7120c03e987317cf57374078075df5c4e6f8d ChangeLog 8315 -SHA256 acd739c2cc875675b3679e53811dc4bec96bd082e0a2586382f8913bc11df2fe ChangeLog 8315 -MISC metadata.xml 223 RMD160 5b4cf8ac1f9426b4b01d94c759aad5768f35fe74 SHA1 1b044a209c743679605d2ac885b26ce7fb55773b SHA256 9406913dbd824f7e31267676defffda846fda6a02ac643a45740cb88219b7a79 size 223 +EBUILD webalizer-2.01.10-r13.ebuild 4491 RMD160 147cac9301a6e4b9e54f528cbab946d00f9e1a4c SHA1 9e259229bc8699da41f4119c0ba42bc719a89c39 SHA256 b7801c4f0d39b8e9f1b3095282ab1b3f68acf825f77e1e21510bb1407120930b +MD5 292f0597bc93b672697dbe2b9e5f0989 webalizer-2.01.10-r13.ebuild 4491 +RMD160 147cac9301a6e4b9e54f528cbab946d00f9e1a4c webalizer-2.01.10-r13.ebuild 4491 +SHA256 b7801c4f0d39b8e9f1b3095282ab1b3f68acf825f77e1e21510bb1407120930b webalizer-2.01.10-r13.ebuild 4491 +MISC ChangeLog 8430 RMD160 c151e1dc77f5a3011477b4a4f3541f155132595f SHA1 8bee0d56c9a290b3b65ee5c11b0af5c5bb9aac94 SHA256 6a92e6db7d605c04cb2841f3eba8619f026dbdb3af2b19a03cc9ee3fe65a8082 +MD5 57df7c6353d8e9498e599521be13174f ChangeLog 8430 +RMD160 c151e1dc77f5a3011477b4a4f3541f155132595f ChangeLog 8430 +SHA256 6a92e6db7d605c04cb2841f3eba8619f026dbdb3af2b19a03cc9ee3fe65a8082 ChangeLog 8430 +MISC metadata.xml 223 RMD160 5b4cf8ac1f9426b4b01d94c759aad5768f35fe74 SHA1 1b044a209c743679605d2ac885b26ce7fb55773b SHA256 9406913dbd824f7e31267676defffda846fda6a02ac643a45740cb88219b7a79 MD5 f4ab9f9db4e50708404d47337257cd4e metadata.xml 223 RMD160 5b4cf8ac1f9426b4b01d94c759aad5768f35fe74 metadata.xml 223 SHA256 9406913dbd824f7e31267676defffda846fda6a02ac643a45740cb88219b7a79 metadata.xml 223 @@ -47,7 +47,7 @@ SHA256 8d25ea7f8a46b22fc68875e96be12c2b738f7f758245aa63d1ab032af972cc19 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.3 (GNU/Linux) -iD8DBQFETl2aI1lqEGTUzyQRAu67AKC1BokD4HiiXxum5RVpfo90HxZaQwCgnYXA -Ef5QEk5N2NCBBtq+49+8AXk= -=sTTZ +iD8DBQFEptLBEzitwsaoONoRAobbAKCbS9DuCyiclSU25eqY04Eo0yUSnACgi66o +g+ze/RbSW7Zao7IF+aWW1JI= +=yBBO -----END PGP SIGNATURE----- diff --git a/app-admin/webalizer/webalizer-2.01.10-r13.ebuild b/app-admin/webalizer/webalizer-2.01.10-r13.ebuild index 33c652be9eee..c73c428b6f86 100644 --- a/app-admin/webalizer/webalizer-2.01.10-r13.ebuild +++ b/app-admin/webalizer/webalizer-2.01.10-r13.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r13.ebuild,v 1.2 2006/04/24 15:46:58 rl03 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r13.ebuild,v 1.3 2006/07/01 19:53:54 rl03 Exp $ # uses webapp.eclass to create directories with right permissions # probably slight overkill but works well -inherit eutils webapp +inherit eutils webapp db-use autotools SLOT="0" WEBAPP_MANUAL_SLOT="yes" @@ -25,7 +25,7 @@ LICENSE="GPL-2" KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" IUSE="apache2 geoip nls search xtended" -DEPEND="!geoip? ( =sys-libs/db-4.2* ) +DEPEND="!geoip? ( >=sys-libs/db-4.2 ) >=sys-libs/zlib-1.1.4 >=media-libs/libpng-1.2 >=media-libs/gd-1.8.3 @@ -76,8 +76,8 @@ src_unpack() { src_compile() { local myconf=" --enable-dns \ - --with-db=/usr/include/db4.2/ \ - --with-dblib=db-4.2" + --with-db=$(db_includedir) \ + --with-dblib=$(db_libname)" use geoip && myconf="${myconf} --enable-geoip" # really dirty hack; necessary due to a really gross ./configure @@ -93,11 +93,11 @@ src_compile() { fi # stupid broken configuration file - autoconf + eautoreconf econf ${myconf} || die "econf failed" - emake || die "make failed" + emake || die "emake failed" } src_install() { -- cgit v1.2.3-65-gdbad