Use system bzip2 library (bug #249140). Get CC and CFLAGS from environment. Bump both EAPI=0 and EAPI=2 ebuilds.

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.25-gentoo-r7-JeR i686

5 files changed, 166 insertions, 2 deletions

diff --git a/app-admin/analog/ChangeLog b/app-admin/analog/ChangeLog
index 5399c64db8af..264fc1f8f552 100644
--- a/app-admin/analog/ChangeLog
+++ b/app-admin/analog/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-admin/analog
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/analog/ChangeLog,v 1.41 2008/11/09 13:28:26 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/analog/ChangeLog,v 1.42 2008/12/15 06:50:43 jer Exp $
+
+*analog-6.0-r3 (15 Dec 2008)
+*analog-6.0-r2 (15 Dec 2008)
+
+  15 Dec 2008; Jeroen Roovers <jer@gentoo.org>
+  +files/analog-6.0-bzip2.patch, +analog-6.0-r2.ebuild,
+  +analog-6.0-r3.ebuild:
+  Use system bzip2 library (bug #249140). Get CC and CFLAGS from
+  environment. Bump both EAPI=0 and EAPI=2 ebuilds.
 
   09 Nov 2008; nixnut <nixnut@gentoo.org> analog-6.0.ebuild:
   Stable on ppc/ppc64 wrt bug 238859
diff --git a/app-admin/analog/Manifest b/app-admin/analog/Manifest
index db0ae30df4f2..cc4a09b46f71 100644
--- a/app-admin/analog/Manifest
+++ b/app-admin/analog/Manifest
@@ -1,9 +1,12 @@
 AUX analog-5.1-gentoo.diff 888 RMD160 1d6e5f71bad897088d6d89e08415a17f8f3d3b5b SHA1 00918f41066f1da8487e9bf667f1f1604f5ebcab SHA256 8c60a0be231f5c16ea7131fa7c43a8d417eeec2da657c494441b22a5b75e59fc
+AUX analog-6.0-bzip2.patch 1907 RMD160 216a7c20b9192f849fb372529d04827a43dd9589 SHA1 5207b261ffeae6c512ac59f4bea5bf2a03694a7e SHA256 07ead6fb5cf41d527a6abb567f140e4cbdc8ae5e0d869ea731eff3208bc8f600
 AUX analog.cfg 3992 RMD160 60c87408dd4300011108e7efa1a7267a6104ad98 SHA1 1151ea868ceafdf37e2225deb88b8e88b7784e1d SHA256 83742dc17e28297fe4a4844bc53ef397ad1bb0514ed98b79ad5a9857f3a61fa8
 DIST analog-5.32.tar.gz 1428349 RMD160 64d5d04829e6088e13bedd0f3de49d2dcbe347c4 SHA1 81cd8c018663f905ce8c11175ca826f019765b4d SHA256 a16c90ad0e9f18372c055bdccebc67f275733672dc5283246c80b191ed3ff93d
 DIST analog-6.0.tar.gz 1553316 RMD160 75c6157d2ac1459ee28a90001787382f5b671dca SHA1 17ad601f84e73c940883fb9b9e805879aac37493 SHA256 31c0e2bedd0968f9d4657db233b20427d8c497be98194daf19d6f859d7f6fcca
 EBUILD analog-5.32.ebuild 1816 RMD160 12ebe8dc373aa5fc28f1e3e7654b0f2269840291 SHA1 7dd64685ab7602816540841a57e4ff3ed3e8ca26 SHA256 fb63a905e3b48fd938e09555450123805142c1bc1625fa10f91181ed15135dd1
 EBUILD analog-6.0-r1.ebuild 1407 RMD160 e9f63a176b81c3413c21c5827b4458a01ffadc27 SHA1 ca0042ce41a7ed2b2aa4d675e56058ff7cf78f09 SHA256 4429f52b6b01b2e19a3a551cf4d2605280549ec988f3a7ab06797d6f86a6a09e
+EBUILD analog-6.0-r2.ebuild 1693 RMD160 8c7065476ccd542e6a7e2093b2e89571be2970fa SHA1 d6ea0fac6c243e4fd7fa651e8cf926e65ea89da0 SHA256 df12c758b6985902474a443c5c8be15c83b63f612ec41af64138fd6cb3e094f1
+EBUILD analog-6.0-r3.ebuild 1276 RMD160 c0241fa4e5e3c91971d52dbe4ae5a31506a93b87 SHA1 d70b6e53804507c417c6e9620d4ecd6999d53666 SHA256 191b7aa4706e20f45fe89dae2019f6d17eb24824c053fb0d7c5f7c3a7516dc60
 EBUILD analog-6.0.ebuild 1794 RMD160 cf99354b2761bc609d2ec3207f6e0351220836ec SHA1 d00f86d45170d255510a15df2c380fe45b9a1e84 SHA256 a39023a069f0cba76f5a796b3d193e9894f8bba4ff22c9f3b6fc6299a6707f55
-MISC ChangeLog 4608 RMD160 1875eebed8654944945a12b59f6b8cdd68468996 SHA1 f5e1e19449c31c5888089f7b4d054d8ee9aa8c66 SHA256 1f34f9880cdd71b7450e56f74ad1b6b2cce87d7250bccfad4c7225889e02c16a
+MISC ChangeLog 4910 RMD160 44f48e9f4079c5579a47cf8c2abc5e09507ef7fd SHA1 7fc92206a5afaf0b6ccb2e3ec34673d33f8824b6 SHA256 85a603eefb0adf3158e7c3a44c696fc9dd0bbf50119738a8de75bd19e7aea236
 MISC metadata.xml 314 RMD160 25181cde297628576a9545bea3a76601485bfaf3 SHA1 ac16b621acf5a22b64859e3323d466fb556fc4c8 SHA256 736baab77aea9c4da199c01e3cd6877c271bd02357ff9b41b537a2232c6e96d7
diff --git a/app-admin/analog/analog-6.0-r2.ebuild b/app-admin/analog/analog-6.0-r2.ebuild
new file mode 100644
index 000000000000..d9eacc4cdc4c
--- /dev/null
+++ b/app-admin/analog/analog-6.0-r2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/analog/analog-6.0-r2.ebuild,v 1.1 2008/12/15 06:50:43 jer Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A webserver log analyzer"
+HOMEPAGE="http://www.analog.cx/"
+SRC_URI="http://www.analog.cx/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=dev-libs/libpcre-3.4
+	>=media-libs/gd-1.8.4-r2
+	sys-libs/zlib
+	media-libs/jpeg
+	media-libs/libpng"
+
+pkg_setup() {
+	if ! built_with_use media-libs/gd jpeg ; then
+		eerror "libgd is missing jpeg support. Please add"
+		eerror "'jpeg' to your USE flags, and re-emerge media-libs/gd."
+		die "libgd needs jpeg support"
+	fi
+	if ! built_with_use media-libs/gd png ; then
+		eerror "libgd is missing jpeg support. Please add"
+		eerror "'png' to your USE flags, and re-emerge media-libs/gd."
+		die "libgd needs png support"
+	fi
+}
+
+S="${WORKDIR}"/${P}/src
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-5.1-gentoo.diff"
+	epatch "${FILESDIR}/${P}-bzip2.patch"
+}
+
+src_compile() {
+	tc-export CC || die "ohnoz"
+	emake || die "make failed"
+}
+
+src_install() {
+	dobin analog || die "dobin failed"
+	newman analog.man analog.1
+
+	dodoc README.txt Licence.txt analog.cfg
+	dohtml -a html,gif,css,ico docs/*
+	dohtml -r how-to
+	docinto examples ; dodoc examples/*
+	docinto cgi ; dodoc anlgform.pl
+
+	insinto /usr/share/analog/images ; doins images/*
+	insinto /usr/share/analog/lang ; doins lang/*
+	dodir /var/log/analog
+	dosym /usr/share/analog/images /var/log/analog/images
+	insinto /etc/analog ; doins "${FILESDIR}/analog.cfg"
+}
diff --git a/app-admin/analog/analog-6.0-r3.ebuild b/app-admin/analog/analog-6.0-r3.ebuild
new file mode 100644
index 000000000000..4bfe597eac83
--- /dev/null
+++ b/app-admin/analog/analog-6.0-r3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/analog/analog-6.0-r3.ebuild,v 1.1 2008/12/15 06:50:43 jer Exp $
+
+EAPI=2
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A webserver log analyzer"
+HOMEPAGE="http://www.analog.cx/"
+SRC_URI="http://www.analog.cx/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=dev-libs/libpcre-3.4
+	>=media-libs/gd-1.8.4-r2[jpeg,png]
+	sys-libs/zlib
+	media-libs/jpeg
+	media-libs/libpng"
+
+S="${WORKDIR}"/${P}/src
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-5.1-gentoo.diff"
+	epatch "${FILESDIR}/${P}-bzip2.patch"
+}
+
+src_compile() {
+	tc-export CC
+	emake || die "make failed"
+}
+
+src_install() {
+	dobin analog || die "dobin failed"
+	newman analog.man analog.1
+
+	dodoc README.txt Licence.txt analog.cfg
+	dohtml -a html,gif,css,ico docs/*
+	dohtml -r how-to
+	docinto examples ; dodoc examples/*
+	docinto cgi ; dodoc anlgform.pl
+
+	insinto /usr/share/analog/images ; doins images/*
+	insinto /usr/share/analog/lang ; doins lang/*
+	dodir /var/log/analog
+	dosym /usr/share/analog/images /var/log/analog/images
+	insinto /etc/analog ; doins "${FILESDIR}/analog.cfg"
+}
diff --git a/app-admin/analog/files/analog-6.0-bzip2.patch b/app-admin/analog/files/analog-6.0-bzip2.patch
new file mode 100644
index 000000000000..5a0c23d7da48
--- /dev/null
+++ b/app-admin/analog/files/analog-6.0-bzip2.patch
@@ -0,0 +1,35 @@
+Use system bzip2 library. Get CC and CFLAGS from environment.
+ -jer (bug #249140)
+
+
+--- analog-6.0/src/Makefile.orig	2004-12-19 14:51:30.000000000 +0100
++++ analog-6.0/src/Makefile	2008-12-15 07:34:09.000000000 +0100
+@@ -2,16 +2,16 @@
+ # Please read docs/Readme.html, or http://www.analog.cx/
+ # This is a general Unix-like Makefile: Makefiles for other OS's can be found
+ #   in the "build" directory.
+-CC = gcc           # which compiler to use: eg cc, acc, gcc. NB Different
++# CC is set in the environment.
+ #                    compilers need different CFLAGS, e.g., -O instead of -O2.
+ MAKE = make        # which "make" to use
+-CFLAGS = -O2    # options, e.g. for optimisation or ANSI compilation.
++# CFLAGS is set in the environment.
+ #                 Some OS's need -D_FILE_OFFSET_BITS=64 to support files > 2MB.
+ #                 HP/UX cc needs CFLAGS = -Aa (HP/UX 9) or -Ae (HP/UX 10)
+ #                 BeOS needs CFLAGS = -O2 -Wl,-L/boot/home/config/lib
+ #                 BS2000/OSD needs CFLAGS = -XLLML -XLLMK
+ #                 NeXTSTEP needs CFLAGS = -O2 -pipe -no-precomp 
+-DEFS =          # any combination of -DNOPIPES -DNODNS -DNODIRENT -DNOGLOB ...
++DEFS = -DHAVE_GD -DHAVE_PCRE -DHAVE_ZLIB -DHAVE_BZLIB
+ #                 ... -DNOOPEN -DNOFOLLOW -DNOALARM -DNOGRAPHICS -DNOGMTIME ...
+ #                 ... -DEBCDIC -DUSE_PLAIN_SETJMP ...
+ #                 ... -DHAVE_GD -DHAVE_ZLIB -DHAVE_BZLIB -DHAVE_PCRE ...
+@@ -30,7 +30,7 @@
+ #
+ OS = UNIX         # Operating system: UNIX, DOS, WIN32, MAC, OS2, OSX, VMS
+ #                   RISCOS, BEOS, NEXTSTEP, MPEIX, BS2000, AS400, OS390
+-LIBS = -lm  # extra libraries needed; most platforms (but not OS X or BeOS)
++LIBS = -lgd -lz -lbz2 -lpcre -lm -lpng -ljpeg
+ #               need -lm LAST
+ #             if you defined HAVE_GD above you also need -lgd -lpng -ljpeg -lz
+ #             if you defined HAVE_ZLIB above you also need -lz