[patch] Ebuild diff from 3.4_rc2 to 3.4_p1

dspam-3.4_rc2-to-3.4_p1.diff (text/plain), 3.95 KB, created by Tom Kirchner on 2005-03-09 08:50:12 UTC

--- dspam-3.4_rc2.ebuild	2005-03-09 02:35:42.000000000 -0500
+++ dspam-3.4_p1.ebuild		2005-03-09 11:31:51.039890912 -0500
@@ -4,7 +4,7 @@
 
 inherit eutils
 
-MY_PV=${PV/_rc/.rc}
+MY_PV=${PV/_p/.pr}
 S=${WORKDIR}/${PN}-${MY_PV}
 DESCRIPTION="A statistical-algorithmic hybrid anti-spam filter"
 SRC_URI="http://dspam.nuclearelephant.com/sources/${PN}-${MY_PV}.tar.gz
@@ -12,7 +12,7 @@
 HOMEPAGE="http://dspam.nuclearelephant.com/"
 LICENSE="GPL-2"
 
-IUSE="debug mysql neural oci8 postgres sqlite large-domain"
+IUSE="debug mysql neural oci8 postgres sqlite sqlite3 large-domain"
 DEPEND="mysql? ( >=dev-db/mysql-3.23 )
 		sqlite? ( <dev-db/sqlite-3 )
 		sqlite3? ( >=dev-db/sqlite-3 )
@@ -33,9 +33,12 @@
 	if (use mysql && use postgres) || \
 		(use mysql && use oci8) || \
 		(use mysql && use sqlite) || \
+		(use mysql && use sqlite3) || \
 		(use postgres && use oci8) || \
 		(use postgres && use sqlite) || \
-		(use sqlite && use oci8); then
+		(use postgres && use sqlite3) || \
+		(use sqlite && use oci8) || \
+		(use sqlite3 && use oci8); then
 		echo
 		ewarn "You have two of either \"mysql\", \"postgres\", \"oci8\", \"sqlite\" or \"sqlite3\" in your USE flags."
 		ewarn "Will default to MySQL as your dspam database backend."
@@ -45,7 +48,7 @@
 		has_version ">=sys-apps/portage-2.0.50" && (
 		einfo "It would be best practice to add the set of USE flags that you use for this"
 		einfo "package to the file: /etc/portage/package.use. Example:"
-		einfo "\`echo \"net-mail/dspam -mysql postgres -oci8 -sqlite -sqlite3\" >> /etc/portage/package.use\`"
+		einfo "\`echo \"mail-filter/dspam -mysql postgres -oci8 -sqlite -sqlite3\" >> /etc/portage/package.use\`"
 		einfo "to build dspam with Postgres database as your dspam backend."
 		)
 		echo
@@ -62,11 +65,12 @@
 
 	# these are the default settings
 	#myconf="${myconf} --enable-daemon"
-	#myconf="${myconf} --enable-nodalcore"
 	myconf="${myconf} --enable-homedir"
 	myconf="${myconf} --enable-long-username"
-	myconf="${myconf} --enable-robinson"
+	# Note: The author recommends that if you enable chi square,
+	#       you also DISABLE graham and burton bayesian tests.
 	#myconf="${myconf} --enable-chi-square"
+	#myconf="${myconf} --disable-graham-bayesian --disable-burton-bayesian"
 	#myconf="${myconf} --enable-robinson-pvalues"
 	use large-domain && myconf="${myconf} --enable-large-scale" ||\
 		myconf="${myconf} --enable-domain-scale"
@@ -115,6 +119,9 @@
 			--with-oracle-version=MAJOR
 			myconf="${myconf} --with-oracle-version=10"
 		fi
+	elif use sqlite3 ; then
+		myconf="${myconf} --with-storage-driver=sqlite3_drv"
+		myconf="${myconf} --enable-virtual-users"
 	elif use sqlite ; then
 		myconf="${myconf} --with-storage-driver=sqlite_drv"
 		myconf="${myconf} --enable-virtual-users"
@@ -152,6 +158,7 @@
 		-i Makefile
 	make DESTDIR=${D} install || die
 	chmod 4755 ${D}/usr/bin/dspam
+	chmod 4755 ${D}/usr/bin/dspam_stats
 
 	# documentation
 	if use mysql; then
@@ -282,6 +289,18 @@
 	exeopts -m0755 -o dspam -g dspam
 	doexe ${FILESDIR}/dspam.cron
 
+	# installs the notification messages
+	diropts -m0775 -o dspam -g dspam
+	dodir ${HOMEDIR}/txt
+	keepdir ${HOMEDIR}/txt
+	insinto ${HOMEDIR}/txt
+	insopts -m644 -o dspam -g dspam
+	for foo in ${S}/txt/*.txt; do
+		if [ ! -f "$(basename ${foo})" ]; then
+			doins ${foo}
+		fi
+	done
+
 	# dspam enviroment
 	echo -ne "CONFIG_PROTECT_MASK=\"${HOMEDIR}\"\n\n" > ${T}/40dspam
 	doenvd ${T}/40dspam || die
@@ -377,6 +396,9 @@
 		/usr/bin/psql -d ${DSPAM_PgSQL_DB} -U postgres -c "GRANT ALL PRIVILEGES ON SCHEMA public TO ${DSPAM_PgSQL_USER};" 1>/dev/null 2>&1
 	elif use oci8 ; then
 		[[ -f ${HOMEDIR}/oracle.data ]] && mv -f ${HOMEDIR}/oracle.data ${HOMEDIR}
+	elif use sqlite3 ; then
+		einfo "sqlite3_drv will automatically create the necessary database"
+		einfo "objects for each user upon first use of DSPAM by that user."
 	elif use sqlite ; then
 		einfo "sqlite_drv will automatically create the necessary database"
 		einfo "objects for each user upon first use of DSPAM by that user."