Clean up and change dep on dev-db/mysql to virtual/mysql (i.e. mysql-community works too) #268321

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

5 files changed, 10 insertions, 168 deletions

diff --git a/mail-filter/policyd/ChangeLog b/mail-filter/policyd/ChangeLog
index 3e45684825fd..e34ac8fc0b9d 100644
--- a/mail-filter/policyd/ChangeLog
+++ b/mail-filter/policyd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-filter/policyd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/policyd/ChangeLog,v 1.6 2009/05/16 00:18:30 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/policyd/ChangeLog,v 1.7 2009/05/22 20:12:04 dertobi123 Exp $
+
+  22 May 2009; Tobias Scherbaum <dertobi123@gentoo.org>
+  -policyd-1.80.ebuild, -policyd-1.81.ebuild, policyd-1.82.ebuild:
+  Clean up and change dep on dev-db/mysql to virtual/mysql (i.e.
+  mysql-community works too) #268321
 
   16 May 2009; Mark Loeser <halcy0n@gentoo.org> policyd-1.80.ebuild,
   policyd-1.81.ebuild, policyd-1.82.ebuild:
diff --git a/mail-filter/policyd/Manifest b/mail-filter/policyd/Manifest
index e736215082cd..013d51c130b4 100644
--- a/mail-filter/policyd/Manifest
+++ b/mail-filter/policyd/Manifest
@@ -1,22 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX policyd-cleanup.cron 59 RMD160 870d699c4a4080c2295101f6530825e78b43b685 SHA1 e98eb7ee9e130aadced27dbf3f9c50f40704ee31 SHA256 b7bd9b05d72872e9cc6d46f2233e060109471acb1a744983cfa8e5643597e5b7
 AUX policyd-makefile.patch 400 RMD160 319cd9c508d9314f7b908a4e5defa6293d6b300d SHA1 d5a1ad64a6f08f5b374d33e03fe71bcf390495f1 SHA256 e5ef0eb74eb27d4ef25df7b96e0461ca6c770493de40dba1e796ba232d1bf7fb
 AUX policyd.confd 61 RMD160 f024acf0f82c3612f05c36dcc8f5f1059bcfc65d SHA1 08e1a533b684b91d8229edba1fdfef0c8be1fe4b SHA256 1b5e38189d93e2348d0633bd1f3399020008ef9dfb94cf11b13ab05ecbc3382c
 AUX policyd.rc 555 RMD160 c80d2a7f265ae94819b6a2cd41b7ad5db87ee800 SHA1 d654813bb21dd5467a4ba300a540a203515d906a SHA256 2a97ce38b4032e5c6328dd9117377c29e816870c532cd5d856b7fd198f620c08
-DIST policyd-1.81.tar.gz 68309 RMD160 e25798338d7ff082e32ec5288e721ed7c75235c3 SHA1 acb6a34826995be04d66d50a93e379823c929ec6 SHA256 5880d77ebd07bd6083b2a915b0e57ea0b9f8912140815de9bbde7d0bb48825f0
 DIST policyd-1.82.tar.gz 68372 RMD160 0258ee9abaa00cde9a139bdeafed36df1ec37537 SHA1 4a9bf4bcf63eb3792794d87682e67b15e4a04707 SHA256 63a90d26732ed24f8d8fa8623d74b73104a61a2c80b0e062437777cf13b80566
-DIST policyd-v1.80.tar.gz 67138 RMD160 fa9ba5f9208cb707ee7f9b447f24340f832cd8cb SHA1 05fc8526c145bed97908144ee7afc773594d67aa SHA256 ce569228d6b6f362a25ffedc3f4458a64bf6f73a9855c6f5b33823d9dfc4e3cd
-EBUILD policyd-1.80.ebuild 2059 RMD160 f7ebfbda17e0c81a2fda7a0c82b62608a913d0fa SHA1 65846261bca390b02fcd6b0bef680df36f9bef58 SHA256 f7e554b24aac69aa1680ea8c321ca962bfe907560189bf2396da199987f6a5d6
-EBUILD policyd-1.81.ebuild 1989 RMD160 3fa123ec1951b27576f03180154feedb7949a9a6 SHA1 8fa6f8b972a5da84e35b38bb07a16ced40f2ae2a SHA256 b521811abfbbbe05199f3124116ea4fe1a09bbea56df17707e9c4c48cb7dee06
-EBUILD policyd-1.82.ebuild 1977 RMD160 80f23c24b8f18100c4cdd5d956a3a0aebe55d8d6 SHA1 f6ae92f07f608c51ac04d72eaaaf583d76024962 SHA256 8300abffe8d2b59822ca5cbd4566097a059681a1462875ee39d8177fd905905c
-MISC ChangeLog 1006 RMD160 61d6703be424ae4eae6b56ec6183a2e1c56009fd SHA1 c85caccba7677225ffe547140a1be8878d31fefc SHA256 9a0121da9c198f339ef1762584ab54b0f617866d9b05ecf2552d702afa928881
+EBUILD policyd-1.82.ebuild 1981 RMD160 c847349ce7b16298d57d9d7e44d954b555f972d1 SHA1 a11472270606d6730bb29373c323a58723c4380f SHA256 4d78ebc55b840960f4996ebdbf6656da59883fd77033512d88a3602d2798727b
+MISC ChangeLog 1235 RMD160 364eb983babcc75cc6c88735bce46869246b2cda SHA1 81928937abd0912d3a192f30e6182875adf28247 SHA256 5dad9c39f5c83feb172b334d27446b22594d37ada0dc5928aeca12c9feef0edb
 MISC metadata.xml 163 RMD160 9d7831690071ef6a890ce066c38c9c4e851a2107 SHA1 6dcd4fa8a9b5cfcc7c0ae80c09e43395fe8e71a7 SHA256 38427b537ef2f561a685876ae3a7799382a1bf7fabef6c2d8765ca9d05056aa2
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkoOBmQACgkQCRZPokWLroSr1QCfQhqWtLstCupfV/4iYroLtN0D
-pAkAmgLjtVSrzptVkbWpAmE/1+tF5Xqc
-=3GbI
------END PGP SIGNATURE-----
diff --git a/mail-filter/policyd/policyd-1.80.ebuild b/mail-filter/policyd/policyd-1.80.ebuild
deleted file mode 100644
index 9caed3e4eaaa..000000000000
--- a/mail-filter/policyd/policyd-1.80.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/policyd/policyd-1.80.ebuild,v 1.4 2009/05/16 00:18:30 halcy0n Exp $
-
-inherit eutils
-
-DESCRIPTION="Policy daemon for postfix and other MTAs"
-HOMEPAGE="http://policyd.sf.net/"
-
-# This is not available through SF mirrors
-SRC_URI="http://policyd.sourceforge.net/${PN}-v${PV}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-DEPEND="dev-db/mysql
-		dev-libs/openssl"
-RDEPEND="${DEPEND}"
-
-MY_P=${PN}-v${PV}
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-makefile.patch"
-
-	ebegin "Applying config patches"
-	sed -i -e s:UID=0:UID=65534:g \
-	    -e s:GID=0:GID=65534:g \
-	    -e s:DAEMON=0:DAEMON=1:g \
-	    -e s:DEBUG=3:DEBUG=0:g \
-	    -e s:DATABASE_KEEPALIVE=0:DATABASE_KEEPALIVE=1:g \
-	    policyd.conf || die "sed failed"
-	eend
-}
-
-src_compile() {
-	emake build || die "emake build failed"
-}
-
-src_install() {
-	insopts -o root -g nobody -m 0750
-	mv cleanup policyd_cleanup
-	mv stats policyd_stats
-
-	dosbin policyd policyd_cleanup policyd_stats
-
-	insopts -o root -g nobody -m 0640
-	insinto /etc
-	doins policyd.conf
-
-	insopts -o root -g nobody -m 0700
-	exeinto /etc/cron.hourly
-	newexe "${FILESDIR}/${PN}-cleanup.cron" ${PN}-cleanup.cron
-
-	dodoc Changelog.txt DATABASE.mysql License.txt README.txt doc/support.txt
-
-	newinitd "${FILESDIR}/${PN}.rc" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-}
-
-pkg_postinst() {
-	einfo "You will need to create the database using the script DATABASE.mysql"
-	einfo "in /usr/share/doc/${PF}/"
-	einfo "Read the mysql section of the README.txt for details."
-	einfo
-	einfo "To use policyd with postfix, update your /etc/postfix/main.cf file by adding"
-	einfo "  check_policy_service inet:127.0.0.1:10031"
-	einfo "to your smtpd_recipient_restrictions line, or similar."
-	einfo
-	einfo "Also remember to start the daemon at boot:"
-	einfo "  rc-update add policyd default"
-	einfo
-	einfo "Read the documentation for more info."
-}
diff --git a/mail-filter/policyd/policyd-1.81.ebuild b/mail-filter/policyd/policyd-1.81.ebuild
deleted file mode 100644
index 9e9c66eb8352..000000000000
--- a/mail-filter/policyd/policyd-1.81.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/policyd/policyd-1.81.ebuild,v 1.3 2009/05/16 00:18:30 halcy0n Exp $
-
-inherit eutils
-
-DESCRIPTION="Policy daemon for postfix and other MTAs"
-HOMEPAGE="http://policyd.sf.net/"
-
-# This is not available through SF mirrors
-SRC_URI="http://policyd.sourceforge.net/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-DEPEND="dev-db/mysql
-		dev-libs/openssl"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-makefile.patch"
-
-	ebegin "Applying config patches"
-	sed -i -e s:UID=0:UID=65534:g \
-	    -e s:GID=0:GID=65534:g \
-	    -e s:DAEMON=0:DAEMON=1:g \
-	    -e s:DEBUG=3:DEBUG=0:g \
-	    -e s:DATABASE_KEEPALIVE=0:DATABASE_KEEPALIVE=1:g \
-	    policyd.conf || die "sed failed"
-	eend
-}
-
-src_compile() {
-	emake build || die "emake build failed"
-}
-
-src_install() {
-	insopts -o root -g nobody -m 0750
-	mv cleanup policyd_cleanup
-	mv stats policyd_stats
-
-	dosbin policyd policyd_cleanup policyd_stats
-
-	insopts -o root -g nobody -m 0640
-	insinto /etc
-	doins policyd.conf
-
-	insopts -o root -g nobody -m 0700
-	exeinto /etc/cron.hourly
-	newexe "${FILESDIR}/${PN}-cleanup.cron" ${PN}-cleanup.cron
-
-	dodoc ChangeLog DATABASE.mysql README doc/support.txt
-
-	newinitd "${FILESDIR}/${PN}.rc" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-}
-
-pkg_postinst() {
-	einfo "You will need to create the database using the script DATABASE.mysql"
-	einfo "in /usr/share/doc/${PF}/"
-	einfo "Read the mysql section of the README.txt for details."
-	einfo
-	einfo "To use policyd with postfix, update your /etc/postfix/main.cf file by adding"
-	einfo "  check_policy_service inet:127.0.0.1:10031"
-	einfo "to your smtpd_recipient_restrictions line, or similar."
-	einfo
-	einfo "Also remember to start the daemon at boot:"
-	einfo "  rc-update add policyd default"
-	einfo
-	einfo "Read the documentation for more info."
-}
diff --git a/mail-filter/policyd/policyd-1.82.ebuild b/mail-filter/policyd/policyd-1.82.ebuild
index 0d7cbd290293..1a0a72527f0f 100644
--- a/mail-filter/policyd/policyd-1.82.ebuild
+++ b/mail-filter/policyd/policyd-1.82.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/policyd/policyd-1.82.ebuild,v 1.3 2009/05/16 00:18:30 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/policyd/policyd-1.82.ebuild,v 1.4 2009/05/22 20:12:04 dertobi123 Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
 IUSE=""
-DEPEND="dev-db/mysql
+DEPEND="virtual/mysql
 		dev-libs/openssl"
 RDEPEND="${DEPEND}"