Remove old. Clean up patches. Respect LDFLAGS (bug #335809).

(Portage version: 2.2_rc83/cvs/Linux i686)

5 files changed, 25 insertions, 93 deletions

diff --git a/app-admin/analog/ChangeLog b/app-admin/analog/ChangeLog
index 79180cf9715b..f844e343c9bb 100644
--- a/app-admin/analog/ChangeLog
+++ b/app-admin/analog/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/analog
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/analog/ChangeLog,v 1.59 2010/01/22 16:37:54 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/analog/ChangeLog,v 1.60 2010/09/18 03:27:45 jer Exp $
+
+*analog-6.0-r4 (18 Sep 2010)
+
+  18 Sep 2010; Jeroen Roovers <jer@gentoo.org> files/analog-5.1-gentoo.diff,
+  -analog-6.0.ebuild, -analog-6.0-r2.ebuild, +analog-6.0-r4.ebuild,
+  files/analog-6.0-bzip2.patch:
+  Remove old. Clean up patches. Respect LDFLAGS (bug #335809).
 
   22 Jan 2010; Samuli Suominen <ssuominen@gentoo.org> analog-6.0-r3.ebuild:
   Require SLOT="0" of media-libs/jpeg for headers.
diff --git a/app-admin/analog/analog-6.0-r2.ebuild b/app-admin/analog/analog-6.0-r4.ebuild
index 770408f27e8d..c6171a1ea355 100644
--- a/app-admin/analog/analog-6.0-r2.ebuild
+++ b/app-admin/analog/analog-6.0-r4.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 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.8 2008/12/20 15:24:59 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/analog/analog-6.0-r4.ebuild,v 1.1 2010/09/18 03:27:45 jer Exp $
+
+EAPI=2
 
 inherit eutils toolchain-funcs
 
@@ -10,33 +12,23 @@ SRC_URI="http://www.analog.cx/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND=">=dev-libs/libpcre-3.4
-	>=media-libs/gd-1.8.4-r2
+	>=media-libs/gd-1.8.4-r2[jpeg,png]
 	sys-libs/zlib
-	media-libs/jpeg
+	media-libs/jpeg:0
 	media-libs/libpng"
+RDEPEND="${DEPEND}"
 
-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
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"/src
+src_prepare() {
+	cd src/
 	epatch "${FILESDIR}/${PN}-5.1-gentoo.diff"
 	epatch "${FILESDIR}/${P}-bzip2.patch"
+	sed -i Makefile \
+		-e 's| -o | $(LDFLAGS)&|g' \
+		|| die "sed Makefile"
 }
 
 src_compile() {
diff --git a/app-admin/analog/analog-6.0.ebuild b/app-admin/analog/analog-6.0.ebuild
deleted file mode 100644
index 43f2888e54c0..000000000000
--- a/app-admin/analog/analog-6.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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.ebuild,v 1.12 2008/11/09 13:28:26 nixnut Exp $
-
-inherit eutils
-
-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
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-5.1-gentoo.diff"
-	sed -i \
-		-e "s:^CFLAGS.*:CFLAGS = ${CFLAGS}:" \
-		-e 's:^DEFS.*:DEFS = -DHAVE_GD -DHAVE_PCRE -DHAVE_ZLIB:' \
-		-e "s:^LIBS.*:LIBS = -lgd -lz -lpcre -lm -lpng -ljpeg:" \
-		src/Makefile \
-		|| die "sed failed"
-}
-
-src_compile() {
-	make -C src || 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-5.1-gentoo.diff b/app-admin/analog/files/analog-5.1-gentoo.diff
index 29edb25313b3..b604c254c572 100644
--- a/app-admin/analog/files/analog-5.1-gentoo.diff
+++ b/app-admin/analog/files/analog-5.1-gentoo.diff
@@ -1,6 +1,5 @@
-diff -ur analog-5.1.orig/src/anlghead.h analog-5.1/src/anlghead.h
---- analog-5.1.orig/src/anlghead.h	Wed Nov  7 06:06:46 2001
-+++ analog-5.1/src/anlghead.h	Mon Dec 31 16:47:43 2001
+--- a/src/anlghead.h	Wed Nov  7 06:06:46 2001
++++ b/src/anlghead.h	Mon Dec 31 16:47:43 2001
 @@ -81,15 +81,11 @@
     and use that directory; or the current directory if it couldn't deduce a
     directory. This may or may not work, so it's better to specify a location
diff --git a/app-admin/analog/files/analog-6.0-bzip2.patch b/app-admin/analog/files/analog-6.0-bzip2.patch
index 30ec4ae8461e..f950a30ef470 100644
--- a/app-admin/analog/files/analog-6.0-bzip2.patch
+++ b/app-admin/analog/files/analog-6.0-bzip2.patch
@@ -2,8 +2,8 @@ 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 22:50:04.000000000 +0100
+--- a/src/Makefile	2004-12-19 14:51:30.000000000 +0100
++++ b/src/Makefile	2008-12-15 22:50:04.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