From d102af8cabbbdffda41d1d3079003efc9e6adeef Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Fri, 7 May 2010 01:48:56 +0000 Subject: [PATCH] Fix quoting issues. Move around (R)DEPENDs so yacc and flex are not RDEPENDs (bug #221341). Set IUSE too. Package-Manager: portage-2.2_rc67/cvs/Linux i686 --- net-proxy/ufdbguard/ChangeLog | 9 ++++++-- net-proxy/ufdbguard/Manifest | 6 ++--- net-proxy/ufdbguard/ufdbguard-1.13.ebuild | 25 ++++++++++++-------- net-proxy/ufdbguard/ufdbguard-1.16.ebuild | 28 ++++++++++++----------- 4 files changed, 40 insertions(+), 28 deletions(-) diff --git a/net-proxy/ufdbguard/ChangeLog b/net-proxy/ufdbguard/ChangeLog index b81b2c71c2e4..af5d9ba8ffaf 100644 --- a/net-proxy/ufdbguard/ChangeLog +++ b/net-proxy/ufdbguard/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-proxy/ufdbguard -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/ufdbguard/ChangeLog,v 1.5 2009/03/18 17:08:49 bass Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/ufdbguard/ChangeLog,v 1.6 2010/05/07 01:48:56 jer Exp $ + + 07 May 2010; Jeroen Roovers ufdbguard-1.13.ebuild, + ufdbguard-1.16.ebuild: + Fix quoting issues. Move around (R)DEPENDs so yacc and flex are not + RDEPENDs (bug #221341). Set IUSE too. *ufdbguard-1.16 (18 Mar 2009) diff --git a/net-proxy/ufdbguard/Manifest b/net-proxy/ufdbguard/Manifest index 540afc2e730e..4d387523589c 100644 --- a/net-proxy/ufdbguard/Manifest +++ b/net-proxy/ufdbguard/Manifest @@ -6,7 +6,7 @@ DIST ufdbGuard-1.11.tar.gz 586455 RMD160 bf5386f65283a41de2263566b812f0f20c22a9f DIST ufdbGuard-1.13.tar.gz 670476 RMD160 c8c70a918cdf7be6d349b5a701b8baabb76b130b SHA1 51a5bc0f461c02e7219781eb73a587ea81b3c60f SHA256 8ddbef562cf741aee6d8574fbab30de067187f992975a2d58f75cf9a39fad875 DIST ufdbGuard-1.16.tar.gz 765012 RMD160 7f66e249c778eefb09edd0894c02ee7962891eb4 SHA1 6f14a5d6f77336bab851887b47f2c24025ed4cc7 SHA256 510ea3f61caeb2e2e9a6d108da0755f41b0a44098ad8661133230b672c779ece EBUILD ufdbguard-1.11.ebuild 1449 RMD160 ab72eddf685fe820661107c123ce02855cd31132 SHA1 b8c060fa78bc04e45a578b7bd83934c799e0fd65 SHA256 95fb89dcc517861b01f7a3af5da8593f96acfac5756d2ada0f18761a77532f86 -EBUILD ufdbguard-1.13.ebuild 1636 RMD160 9863d276f6e927f20aef8931bb3ae13694141ee8 SHA1 ea26cd15b8bb3dcc31d0d6a208aa01d9074570b7 SHA256 5ff1572a0d0706b135564843a2c0a75205624cee3884e90e716b7302c88d5e28 -EBUILD ufdbguard-1.16.ebuild 1782 RMD160 5e60986c433acc543d0a50ee52581518dbf88a05 SHA1 18701e974259e41a201691c5d766e693dfd46a36 SHA256 e6d6c40d9c019e849ea056ec79a21bfff24185cd00feaa8791ea89a93a948c9a -MISC ChangeLog 848 RMD160 6e04dcd8ece7df086ef1ba5fed9a62bc5ebc40c5 SHA1 36db0d9dc04e8223b7c5dd286af1f7d8e1e3ab1c SHA256 fd00192ee6539d94e04018a0c030e5768dcf8b6d756c83f526d725d8f9f36195 +EBUILD ufdbguard-1.13.ebuild 1648 RMD160 1d214627f4646df03c707ede7bce5a9e54c503dc SHA1 4fad5bfb47c8bd3992527bc87bdf3fb719a42f5f SHA256 ea743a87382b35bc9be1a296a88d9cab85ddff748595c371f6b574d8b0d2a620 +EBUILD ufdbguard-1.16.ebuild 1697 RMD160 a51c392dc7775d61775a804a5ccd8e8b6ef8e48e SHA1 047b1a4d4aee039f690cf5372b326088655da74d SHA256 b5a43733448a4e9fba40410aa18c0c0f2046564b74564590fbb42fd8e7a3d95a +MISC ChangeLog 1053 RMD160 16aed7fb46b23929de0afcbe54d228a7c4e3091c SHA1 d2ff25e5d0ffcab1464d80dd3d0d1221b78dd7d8 SHA256 afbd35ec04f929a827326c664585dab0f9f1820b2fc6156e1f70d8ccd263d3d1 MISC metadata.xml 480 RMD160 0fdde361e5387cfb2309ac143af25bafa90c85a7 SHA1 3cf13af5230506504ace227a6bcffad632ec213c SHA256 578bc2eca5799022f63aa1adf4d4f67b73e53d8c3b4e9ee9393d8484c82eb500 diff --git a/net-proxy/ufdbguard/ufdbguard-1.13.ebuild b/net-proxy/ufdbguard/ufdbguard-1.13.ebuild index 847911324d3e..85c8c9f7236d 100644 --- a/net-proxy/ufdbguard/ufdbguard-1.13.ebuild +++ b/net-proxy/ufdbguard/ufdbguard-1.13.ebuild @@ -1,6 +1,6 @@ -# 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/net-proxy/ufdbguard/ufdbguard-1.13.ebuild,v 1.2 2008/10/12 08:03:18 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/ufdbguard/ufdbguard-1.13.ebuild,v 1.3 2010/05/07 01:48:56 jer Exp $ inherit eutils DESCRIPTION="ufdbGuard is a redirector for the Squid internet proxy." @@ -10,13 +10,18 @@ SRC_URI="mirror://sourceforge/ufdbguard/ufdbGuard-${PV}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~x86" +IUSE="" -DEPEND="dev-libs/openssl - app-arch/bzip2 - dev-util/yacc - sys-devel/flex" -RDEPEND="${DEPEND} - net-misc/wget" +RDEPEND=" + dev-libs/openssl + app-arch/bzip2 + net-misc/wget +" +DEPEND=" + ${RDEPEND} + dev-util/yacc + sys-devel/flex +" S="${WORKDIR}/ufdbGuard-${PV}" @@ -45,8 +50,8 @@ src_install() { insinto /etc/ufdbguard doins src/ufdbGuard.conf - newconfd ${FILESDIR}/ufdbguard.confd ufdbguard - newinitd ${FILESDIR}/ufdbguard.initd ufdbguard + newconfd "${FILESDIR}"/ufdbguard.confd ufdbguard + newinitd "${FILESDIR}"/ufdbguard.initd ufdbguard } diff --git a/net-proxy/ufdbguard/ufdbguard-1.16.ebuild b/net-proxy/ufdbguard/ufdbguard-1.16.ebuild index f6f31703f832..8ca988c9559f 100644 --- a/net-proxy/ufdbguard/ufdbguard-1.16.ebuild +++ b/net-proxy/ufdbguard/ufdbguard-1.16.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/ufdbguard/ufdbguard-1.16.ebuild,v 1.1 2009/03/18 17:08:49 bass Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/ufdbguard/ufdbguard-1.16.ebuild,v 1.2 2010/05/07 01:48:56 jer Exp $ inherit eutils DESCRIPTION="ufdbGuard is a redirector for the Squid internet proxy." @@ -10,13 +10,18 @@ SRC_URI="mirror://sourceforge/ufdbguard/ufdbGuard-${PV}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~x86" +IUSE="" -DEPEND="dev-libs/openssl - app-arch/bzip2 - dev-util/yacc - sys-devel/flex" -RDEPEND="${DEPEND} - net-misc/wget" +RDEPEND=" + dev-libs/openssl + app-arch/bzip2 + net-misc/wget +" +DEPEND=" + ${RDEPEND} + dev-util/yacc + sys-devel/flex +" S="${WORKDIR}/ufdbGuard-${PV}" @@ -48,11 +53,8 @@ src_install() { insinto /usr/share/ufdbguard/images doins src/images/* - newconfd ${FILESDIR}/ufdbguard.confd ufdbguard - #newconfd ${FILESDIR}/ufdbhttpd.confd ufdbhttpd - newinitd ${FILESDIR}/ufdbguard.initd ufdbguard - #newinitd ${FILESDIR}/ufdbhttpd.initd ufdbhttpd - + newconfd "${FILESDIR}"/ufdbguard.confd ufdbguard + newinitd "${FILESDIR}"/ufdbguard.initd ufdbguard } pkg_postinst() { -- 2.26.2