Fix QA warnings and sanitize the ebuild code.

(Portage version: 2.0.54)

5 files changed, 141 insertions, 15 deletions

diff --git a/net-proxy/oops/ChangeLog b/net-proxy/oops/ChangeLog
index db1727346be7..4daf74e338fe 100644
--- a/net-proxy/oops/ChangeLog
+++ b/net-proxy/oops/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/oops
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/oops/ChangeLog,v 1.6 2005/06/04 14:38:03 mrness Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/oops/ChangeLog,v 1.7 2006/03/06 20:33:14 mrness Exp $
+
+*oops-1.5.24_pre20050503-r1 (06 Mar 2006)
+
+  06 Mar 2006; Alin Nastac <mrness@gentoo.org>
+  +files/oops-1.5.24-textrel.patch, +oops-1.5.24_pre20050503-r1.ebuild:
+  Fix QA warnings and sanitize the ebuild code.
 
   04 Jun 2005; Alin Nastac <mrness@gentoo.org> -oops-1.5.23.ebuild:
   Remove obsolete version.
diff --git a/net-proxy/oops/Manifest b/net-proxy/oops/Manifest
index 81704e9e59c9..ca08d4e67ec2 100644
--- a/net-proxy/oops/Manifest
+++ b/net-proxy/oops/Manifest
@@ -1,16 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 ade96e360b510e06a645a021c3efd0f3 oops-1.5.24_pre20050503.ebuild 2554
 MD5 c5f413ab29dd8cfe388327f32eb3026a ChangeLog 2737
-MD5 0bba18e763cee72e6af83a6bc6e1db87 metadata.xml 241
-MD5 6f1e80af4f1280cfb10b31ab9d2ab820 files/oops.cfg 17896
 MD5 a36b9f44efe9372d826e375c0b562cf4 files/digest-oops-1.5.24_pre20050503 140
+MD5 a36b9f44efe9372d826e375c0b562cf4 files/digest-oops-1.5.24_pre20050503-r1 140
+MD5 1d6a6205eb41cb5a0c93d0c643375dbf files/oops-1.5.24-textrel.patch 803
+MD5 6f1e80af4f1280cfb10b31ab9d2ab820 files/oops.cfg 17896
 MD5 5428b5e23f57fbf884ff1b92bd9ad562 files/oops.initd 515
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCobzejiC39V7gKu0RAqI/AKDVXpiBeMhAgBR4KK2L3IN6/1KuXwCfVrr8
-QliBMgBvSbyDUsJlT1tvPvY=
-=u2ur
------END PGP SIGNATURE-----
+MD5 0bba18e763cee72e6af83a6bc6e1db87 metadata.xml 241
+MD5 242ce2aa4d0f7ac558de799fd5f8747f oops-1.5.24_pre20050503-r1.ebuild 2479
+MD5 ade96e360b510e06a645a021c3efd0f3 oops-1.5.24_pre20050503.ebuild 2554
diff --git a/net-proxy/oops/files/digest-oops-1.5.24_pre20050503-r1 b/net-proxy/oops/files/digest-oops-1.5.24_pre20050503-r1
new file mode 100644
index 000000000000..61ed89b1cbe4
--- /dev/null
+++ b/net-proxy/oops/files/digest-oops-1.5.24_pre20050503-r1
@@ -0,0 +1,2 @@
+MD5 bfa19752af517bb5a6cd746acf61064c oops-1.5.23.tar.gz 473290
+MD5 8fbd0e763338eba31949d2a20217707a oops-1.5.24_pre20050503.patch.gz 101103
diff --git a/net-proxy/oops/files/oops-1.5.24-textrel.patch b/net-proxy/oops/files/oops-1.5.24-textrel.patch
new file mode 100644
index 000000000000..432a86d07435
--- /dev/null
+++ b/net-proxy/oops/files/oops-1.5.24-textrel.patch
@@ -0,0 +1,24 @@
+diff -Nru oops-1.5.23.orig/src/Makefile.in oops-1.5.23/src/Makefile.in
+--- oops-1.5.23.orig/src/Makefile.in	2006-03-06 22:14:53.000000000 +0200
++++ oops-1.5.23/src/Makefile.in	2006-03-06 22:17:58.954199750 +0200
+@@ -29,7 +29,7 @@
+ 
+ #CFLAGS = -Wall -ggdb -D_REENTRANT -D_POSIX_PTHREADS_SEMANTICS
+ 
+-CFLAGS = @CFLAGS@ @DEFS@
++CFLAGS = @CFLAGS@ -fPIE @DEFS@
+ 
+ VER=@VER@
+ OOPSPATH=@prefix@/oops
+diff -Nru oops-1.5.23.orig/src/modules/Makefile.in oops-1.5.23/src/modules/Makefile.in
+--- oops-1.5.23.orig/src/modules/Makefile.in	2006-03-06 22:14:52.000000000 +0200
++++ oops-1.5.23/src/modules/Makefile.in	2006-03-06 22:18:21.967638000 +0200
+@@ -1,7 +1,7 @@
+ CC = @CC@
+ CXX = @CXX@
+ LIBS = @LIBS@
+-CFLAGS = @CFLAGS@ @DEFS@
++CFLAGS = @CFLAGS@ -fPIC @DEFS@
+ LDFLAGS = @LDFLAGS@
+ LD = @LD@
+ SOFLAGS = @SOFLAGS@
diff --git a/net-proxy/oops/oops-1.5.24_pre20050503-r1.ebuild b/net-proxy/oops/oops-1.5.24_pre20050503-r1.ebuild
new file mode 100644
index 000000000000..573ad8ecc007
--- /dev/null
+++ b/net-proxy/oops/oops-1.5.24_pre20050503-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/oops/oops-1.5.24_pre20050503-r1.ebuild,v 1.1 2006/03/06 20:33:14 mrness Exp $
+
+inherit eutils
+
+MY_P="${PN}-1.5.23"
+
+DESCRIPTION="An advanced multithreaded caching web proxy"
+HOMEPAGE="http://zipper.paco.net/~igor/oops.eng/"
+SRC_URI="http://zipper.paco.net/~igor/oops/${MY_P}.tar.gz
+	mirror://gentoo/${P}.patch.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~sparc ~x86"
+IUSE="mysql postgres"
+
+RDEPEND="dev-libs/libpcre
+	>=sys-libs/db-3
+	mysql? ( dev-db/mysql )
+	postgres? ( dev-db/postgresql )"
+DEPEND="${RDEPEND}
+	sys-devel/flex"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${WORKDIR}/${P}.patch"
+	epatch "${FILESDIR}/${P/_*}-textrel.patch"
+	sed -i -e 's:/usr/local/lib/libpcre:/usr/lib/libpcre:g' configure
+	sed -i -e 's:y\.tab\.h:y.tab.c:' src/Makefile.in
+}
+
+src_compile() {
+	./configure \
+		--prefix=/usr \
+		--libdir=/usr/lib/oops \
+		--enable-oops-user=squid \
+		--sysconfdir=/etc/oops \
+		--sbindir=/usr/sbin \
+		--with-regexp=pcre \
+		--localstatedir=/var/run/oops \
+		--enable-large-files \
+	|| die "configure problem"
+
+	sed -i -e '/STRERROR_R/d' src/config.h.in
+	sed -i \
+		-e "s|OOPS_LIBDIR = /usr/lib/oops|OOPS_LIBDIR = ${D}/usr/lib/oops|" \
+		-e "s|OOPS_SBINDIR = /usr/sbin|OOPS_SBINDIR = ${D}/usr/sbin|" \
+		-e "s|OOPS_SYSCONFDIR = /etc/oops|OOPS_SYSCONFDIR = ${D}/etc/oops|" \
+		-e "s|OOPS_LOCALSTATEDIR = /var/run/oops|OOPS_LOCALSTATEDIR = ${D}/var/run/oops|" \
+		-e "s|OOPSPATH=/usr/oops|OOPSPATH=${D}/usr/oops|" \
+		src/Makefile
+	emake || die "compile problem"
+}
+
+src_install() {
+	dodir /usr/sbin
+	einstall || die "install problem"
+	fowners root:squid /etc/oops
+	fperms 0750 /etc/oops
+
+	exeinto /etc/init.d
+	newexe "${FILESDIR}/oops.initd" "${PN}"
+	insinto /etc/oops
+	doins "${FILESDIR}/oops.cfg"
+
+	diropts -m0755 -o squid
+	dodir /var/run/oops
+	diropts -m0770 -o squid
+	dodir /var/log/oops
+	dodir /var/lib/oops
+	dodir /var/lib/oops/storage
+	keepdir /var/lib/oops/storage
+	dodir /var/lib/oops/db
+	keepdir /var/lib/oops/db
+
+	# cleanups
+	rm -rf "${D}/usr/oops"
+	rm -rf "${D}/usr/lib/oops/modules"
+
+	# config files; if already exist, move them to *.eg
+	cd "${D}/etc/oops"
+	local x y
+	for y in . tables ; do
+		for x in "${y}"/* ; do
+			if [ -f "${x}" ] ; then
+				if [ -f "${ROOT}/etc/oops/${x}" ]; then
+					mv "${x}" "${x}.eg"
+				else
+					cp "${x}" "${x}.eg"
+				fi
+			fi
+		done
+	done
+}
+