keks-overlay.git

@@ -12,5 +12,5 @@ AUX webmail_files 334 RMD160 f791304987a7ddc324b116477b71f4b7180a34c3 SHA1 dcfad

 DIST courier-0.58.0.tar.bz2 7123136 RMD160 940fb7967d154aeeb462691beb508155b3df4e29 SHA1 964d81e6de5390678c9f10dddbc176273b925f6d SHA256 d61db181df19a2deb0ff31356665042d79b718efbab6b1615b6b1ce5c8de5742

 DIST courier-0.59.0.tar.bz2 7121762 RMD160 580e57fd9d39b62772e07dcdec653379cd21caaf SHA1 6870d2b12f1c93d5ede12f2a5c9c1107a7fb647c SHA256 e488cc920ed970c6d38496dba21359b50c6032ff4f2f91432b5d23db261578ec

 EBUILD courier-0.58.0.ebuild 11087 RMD160 5b97e5b10267ee82b342eb84ae552f5e172f470a SHA1 3de581bedc7d02d16c3cbdc3cbc386b862ae0a60 SHA256 6c4fc052a2274f65ea723e9a48292f471cf1c4ccde874a2f81cae652b4e963d1

-EBUILD courier-0.59.0.ebuild 10898 RMD160 2cb8cc12e757f39ebff7eb194a967d8a63f0c6c4 SHA1 aa8510e10ff21dfeb99c702dfee08d5c9e4cc5e8 SHA256 9be469d62bc59f38f5dccda78291e68f868335b65ff4551f5d88d1b496f691bf

+EBUILD courier-0.59.0.ebuild 10499 RMD160 e8f10e5b7754ff7ae6fcab107c482ca9d7ba7ef2 SHA1 5cb0b460667c94452463e3950e29dba2d41466d7 SHA256 23642c350f7e9bf01ddb32e5d5c4d0e1096431053325ecd9556c4009a581241d

 MISC metadata.xml 322 RMD160 44060011d03244f97a8cc9605f0eb0de3631a2e5 SHA1 ca88991053a2eef8c9f1603ce850eff1d145deaa SHA256 1ef3b7121e17952973a7b717155b7e892b40ef64ff22d370bf7d425521df88a0

@@ -19,7 +19,7 @@ LICENSE="GPL-2"

 # not in keywords due to missing dependencies: ~arm ~s390 ~ppc64

 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"

 IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite mailwrapper \

-	fam nowebmail nowebadmin"

+	fam web webmail"

 PROVIDE="virtual/mta

 	 virtual/mda

@@ -84,16 +84,6 @@ src_compile() {

 	myconf="${myconf} $(use_with fam)"

 	#myconf="${myconf} --without-webmail --without-webadmin"

-	#if use nowebadmin ; then

-	#	sed -i -e 's:\(^ac_subdirs_all=.*\)webadmin \(.*$\):\1\2:' configure

-	#fi

-	#

-	#if use nowebmail ; then

-	#	sed -i -e 's:\(^ac_subdirs_all=.*\)webmail \(.*$\):\1\2:' configure

-	#	sed -i -e 's:\(^ac_subdirs_all=.*\)ldapaddressbook \(.*$\):\1\2:' configure

-	#	sed -i -e 's:\(^ac_subdirs_all=.*\)gpglib \(.*$\):\1\2:' configure

-	#fi

-

 	einfo "Configuring courier: $(echo ${myconf} | xargs echo)"

 	econf \

@@ -146,12 +136,12 @@ src_install() {

 	make install-configure || die "install-configure"

 	# Get rid of files we dont want

-	if use nowebmail ; then

+	if ! use webmail ; then

 		cd "${D}"

 		cat "${FILESDIR}/webmail_files" | xargs rm -rf

 	fi

-	if use nowebadmin ; then

+	if ! use web ; then

 		cd "${D}"

 		cat "${FILESDIR}/webadmin_files" | xargs rm -rf

 	fi

@@ -169,7 +159,7 @@ src_install() {

 	use fam || sed -i -e's|^.*use famd$||g' "${D}/etc/init.d/courier"

 	cd "${D}/etc/courier"

-	if ! use nowebmail ; then

+	if use webmail ; then

 		insinto /etc/courier

 		newins "${FILESDIR}/apache-sqwebmail.inc" apache-sqwebmail.inc

 	fi

@@ -216,13 +206,13 @@ src_install() {

 	dodoc tcpd/README.couriertls

 	mv "${D}/usr/share/courier/htmldoc" "${D}/usr/share/doc/${P}/html"

-	if ! use nowebmail ; then

+	if use webmail ; then

 		insinto /usr/$(get_libdir)/courier/courier

 		insopts -m 755 -o mail -g mail

 		doins "${S}/courier/webmaild"

 	fi

-	if ! use nowebadmin ; then

+	if use web ; then

 		insinto /etc/courier/webadmin

 		insopts -m 400 -o mail -g mail

 		doins "${FILESDIR}/password.dist"

@@ -231,7 +221,7 @@ src_install() {

 	# avoid name collisions in /usr/sbin, make webadmin match

 	cd "${D}/usr/sbin"

 	for f in imapd imapd-ssl pop3d pop3d-ssl ; do mv "${f}" "courier-${f}" ; done

-	if ! use nowebadmin ; then

+	if use web ; then

 		sed -i -e 's:\$sbindir\/imapd:\$sbindir\/courier-imapd:g' \

 			-e 's:\$sbindir\/imapd-ssl:\$sbindir\/courier-imapd-ssl:g' \

 			"${D}/usr/share/courier/courierwebadmin/admin-40imap.pl" \