From 1d3d82d7f90054ccca08e8aebbf6cf11daae6159 Mon Sep 17 00:00:00 2001
From: Marcin Deranek <gringo@slonko.net>
Date: Fri, 7 Aug 2015 09:10:21 +0200
Subject: Dropped apache use flag. Cleanup.

---
 net-mail/sympa/Manifest            |  2 +-
 net-mail/sympa/sympa-6.1.24.ebuild | 26 ++++++++++----------------
 2 files changed, 11 insertions(+), 17 deletions(-)

(limited to 'net-mail')

diff --git a/net-mail/sympa/Manifest b/net-mail/sympa/Manifest
index 7d7055c..911bbe6 100644
--- a/net-mail/sympa/Manifest
+++ b/net-mail/sympa/Manifest
@@ -18,4 +18,4 @@ EBUILD sympa-5.4.7.ebuild 7508 SHA256 faff73c9bc9b25eaf9bd8cd19d7339520272f02460
 EBUILD sympa-5.4.9999.ebuild 7497 SHA256 42c7a33951c471556a283fc8a36cf47a62431c14bd19c80a957545838cf8ef14 SHA512 bb1d1e4490cc03ad58643852ba770ae4a932a948c377e3e9e64d8293b0dd658f48e01c9e9522105da6a24724b63d1031e10f3588bac64219201515fb45fe250e WHIRLPOOL 64851733773a73578ae1b21d388add31e9a85845f4abd1c6c5c83ba09184a495b7c8515d767ec6127ee9b4837de5d7477efecfa94234160fe7d459655af184f4
 EBUILD sympa-6.0.6.ebuild 7841 SHA256 7c5bea14724562e018ef945ca2f33132f837f7c5a08be31370a149a4452cbd2d SHA512 ea289a7ba67839b1b6156680148d27b8418d1ccbcc8ad1d76430114aa5fabfd69481d161ded0e78367aef62f93f533e9026c32ef5c8212e44f04f9b239dcfa64 WHIRLPOOL 6415bf2c34981c3b49da9affff6deac52e4c7734bef5a06de149967e97cffd562f210bf67869429003568678cbde1747af86ef170bb045d10fc6e1b266a7c60b
 EBUILD sympa-6.0.9999.ebuild 7830 SHA256 4a63bb61f3541daaa3098d8ee5356cfaa2f063e253fc75feaa3e00f15f14557d SHA512 b5512dce1e16ad45b6b9993d540ef0c29a181db8489f632e8b4fd288820804de32c53c2d0ba0d99ede05118cb971567a82498295f31e3a4fc99d0eeca482bf59 WHIRLPOOL 375557b8f6efea011f5524f5fd2f23f5a6d7c56638b11ec730f1c23e9a1bd650774d91648da924fafed412e55f10a14deca2281af78e4d881a86b5f2d9a5f494
-EBUILD sympa-6.1.24.ebuild 7954 SHA256 31c4ee338816ddaa6a0754570c929936a23ea0a0737b56abe813a3d8b02d6647 SHA512 3680920c32e934ac60c2dc764bc1116c04947c8469c7a2fff92d8f1c2a88dd5c2f51f0b6af8652396be3917766cbf6d344ca3e6d42858bded0b3a5b3eccbde4b WHIRLPOOL 639e8db0625e7267f4fbac858734ce54cebebdc16c8635674acaa1de15e2487b3a6c53d5d0bd7475bbae990c3c7dfa34f05c1585170f385b01364ce1e7f703b9
+EBUILD sympa-6.1.24.ebuild 7716 SHA256 56e177ca094f7877ee5ce1798473f7372e3d266799156674f363644aae2d36c1 SHA512 4125780540d601dfc6c3f20e5289c42776b2f77167ce9a5e7018d877ee96176affddc06154384a14dfb40d0e396c60cad208d7677664102a00c1f0d45c4d12d0 WHIRLPOOL 54eb4d51ab3fa3afa97af7f49ef2924a29b03444b4878c8a6d8ff173d08bc06277519dbbd4e6e89f249d2489d01b36a0fea95ccea424eae5cd9cd7a471ad8eaf
diff --git a/net-mail/sympa/sympa-6.1.24.ebuild b/net-mail/sympa/sympa-6.1.24.ebuild
index 63657b1..ad7044a 100644
--- a/net-mail/sympa/sympa-6.1.24.ebuild
+++ b/net-mail/sympa/sympa-6.1.24.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit eutils user depend.apache multilib autotools versionator
+inherit eutils user multilib autotools versionator
 
 SYMPA_VERSION="$(get_version_component_range 1-2)"
 SYMPA_RELEASE="$(get_version_component_range 3-)"
@@ -23,17 +23,16 @@ else
 fi
 
 DESCRIPTION="A feature-rich open source mailing list software"
-HOMEPAGE="http://www.sympa.org/features.html"
+HOMEPAGE="http://www.sympa.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~amd64"
-IUSE="apache2 clamav -compat dkim fastcgi ldap mysql nfs nls postgres soap sqlite ssl"
+IUSE="clamav -compat dkim fastcgi ldap mysql nfs nls postgres soap sqlite ssl"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
 # See http://www.sympa.org/manual/installing-sympa#required_cpan_modules
 RDEPEND="
-	${DEPEND_APACHE}
 	>=dev-lang/perl-5.8
 	>=dev-perl/CGI-3.35
 	>=virtual/perl-DB_File-1.75
@@ -139,12 +138,12 @@ src_configure() {
 }
 
 src_compile() {
-	emake CFLAGS="${CFLAGS} -Wl,-z,now" || die "emake failed."
+	emake CFLAGS="${CFLAGS} -Wl,-z,now"
 }
 
 src_install() {
 
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" install
 
 	# Do not overwrite data_structure.version
 	rm -f "${D}/etc/sympa/data_structure.version"
@@ -212,16 +211,11 @@ src_install() {
 	keepdir /var/lib/sympa
 	keepdir /var/lib/sympa/lists
 
-	newdoc "${FILESDIR}/${PN}-apache.conf" apache.conf || \
-		die "newdoc failed"
-	newdoc "${FILESDIR}/${PN}-apache_soap.conf" apache_soap.conf || \
-		die "newdoc failed"
-	newdoc "${FILESDIR}/${PN}-lighttpd.conf" lighttpd.conf ||\
-		die "newdoc failed"
-	newdoc "${FILESDIR}/${PN}-lighttpd_soap.conf" lighttpd_soap.conf ||\
-		die "newdoc failed"
-	newdoc "${FILESDIR}/${PN}-nginx.conf" nginx.conf ||\
-		die "newdoc failed"
+	newdoc "${FILESDIR}/${PN}-apache.conf" apache.conf
+	newdoc "${FILESDIR}/${PN}-apache_soap.conf" apache_soap.conf
+	newdoc "${FILESDIR}/${PN}-lighttpd.conf" lighttpd.conf
+	newdoc "${FILESDIR}/${PN}-lighttpd_soap.conf" lighttpd_soap.conf
+	newdoc "${FILESDIR}/${PN}-nginx.conf" nginx.conf
 }
 
 pkg_postinst() {
-- 
cgit v1.2.3