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

Package-Manager: portage-2.2_rc83/cvs/Linux i686

6 files changed, 29 insertions, 98 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/Manifest b/app-admin/analog/Manifest
index 6ec3e7a9656f..3ab5e7ab2979 100644
--- a/app-admin/analog/Manifest
+++ b/app-admin/analog/Manifest
@@ -1,9 +1,8 @@
-AUX analog-5.1-gentoo.diff 888 RMD160 1d6e5f71bad897088d6d89e08415a17f8f3d3b5b SHA1 00918f41066f1da8487e9bf667f1f1604f5ebcab SHA256 8c60a0be231f5c16ea7131fa7c43a8d417eeec2da657c494441b22a5b75e59fc
-AUX analog-6.0-bzip2.patch 3283 RMD160 7141642338edd4c0bc04f7f1eee7ad48d34246fc SHA1 ddca44d9801b11d4826f663658db1cb0de412c66 SHA256 5f9fc63e4bbb1ed0dcdf30cc2a2ab856c824084ba79f3bbb7df36132214ed42f
+AUX analog-5.1-gentoo.diff 799 RMD160 b28d553ffd5ffffacf3d8ae15aac1edcbc41c90c SHA1 ebc18f5cb362385aa2c884fe568a44365f417308 SHA256 4d748bf259f372578306a16b04c8442ddfa22f5f867c281758abc589c09e1b14
+AUX analog-6.0-bzip2.patch 3260 RMD160 1728c4edac24bd09b938b86ceb42e151357c0878 SHA1 4873efd3b33a544f6d16c2d04292b9e408344bf2 SHA256 c71786544305d0ec1d469a621b3ae75889828af210d2d19a7a984d4a4c1faf6b
 AUX analog.cfg 3992 RMD160 60c87408dd4300011108e7efa1a7267a6104ad98 SHA1 1151ea868ceafdf37e2225deb88b8e88b7784e1d SHA256 83742dc17e28297fe4a4844bc53ef397ad1bb0514ed98b79ad5a9857f3a61fa8
 DIST analog-6.0.tar.gz 1553316 RMD160 75c6157d2ac1459ee28a90001787382f5b671dca SHA1 17ad601f84e73c940883fb9b9e805879aac37493 SHA256 31c0e2bedd0968f9d4657db233b20427d8c497be98194daf19d6f859d7f6fcca
-EBUILD analog-6.0-r2.ebuild 1655 RMD160 d26bf9999e121a75b34ed6200c8ce239fc0b9f27 SHA1 8ef426c93f1c03b06cda7ec72e9a04c3e0efe07e SHA256 8d8e0c0236382153d4f3b40a4beec3354daa3fd0e00e4caedbfa530c3721f7c9
 EBUILD analog-6.0-r3.ebuild 1264 RMD160 0b03ff1e7b50fbcc90cc8e33a00f2409f09d3a3c SHA1 58a3c75d155642c088d4fe89d57e3bb32ef617f4 SHA256 bc344e04b7aff8703d08a2d2f2f5aa1efd8bd9a49dbf499393592c9792048634
-EBUILD analog-6.0.ebuild 1794 RMD160 cf99354b2761bc609d2ec3207f6e0351220836ec SHA1 d00f86d45170d255510a15df2c380fe45b9a1e84 SHA256 a39023a069f0cba76f5a796b3d193e9894f8bba4ff22c9f3b6fc6299a6707f55
-MISC ChangeLog 6847 RMD160 52bb6ab1909bd92fe14d1448a602f4eb0a2a3a65 SHA1 d48f612628f25c3667d9eee1d457bdd01d995620 SHA256 eb9b8b44af3741fa691d9619d0e5208d2ba1c26cd77122fd676ef432e1309bf1
+EBUILD analog-6.0-r4.ebuild 1333 RMD160 7d5dbe92047e4f35f7c5fa0278b06d9042a9ab97 SHA1 503f39969d48bf382b614fc93fffdd2e80f82d23 SHA256 1c5983e0285354a834d0c7c9b808645f67c8e6447fa74106987ba693a0854908
+MISC ChangeLog 7112 RMD160 d7b6ad1f909b89aec941a2497791408dcebab42f SHA1 b44337b822f9b97822c163b0798492b1d4d5722b SHA256 08d7dc2153d65b160b992dd38d0f6637073caff61422ac292b09c82c22a2fb10
 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-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