Bump and fix bug #456166. Thanks to slepnoga.

(Portage version: 2.1.11.55/cvs/Linux x86_64, signed Manifest commit with key F8DBDADE)

4 files changed, 16 insertions, 62 deletions

diff --git a/www-apps/sugarcrm/ChangeLog b/www-apps/sugarcrm/ChangeLog
index f835bbabf753..d3e9f7089922 100644
--- a/www-apps/sugarcrm/ChangeLog
+++ b/www-apps/sugarcrm/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-apps/sugarcrm
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/sugarcrm/ChangeLog,v 1.5 2013/01/13 17:33:09 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/sugarcrm/ChangeLog,v 1.6 2013/03/28 14:43:03 maksbotan Exp $
+
+*sugarcrm-6.5.10 (28 Mar 2013)
+*sugarcrm-6.5.10-r1 (28 Mar 2013)
+
+  28 Mar 2013; Maxim Koltsov <maksbotan@gentoo.org> +sugarcrm-6.5.10-r1.ebuild,
+  +sugarcrm-6.5.10.ebuild, -sugarcrm-6.4.5.ebuild, -sugarcrm-6.5.1.ebuild,
+  metadata.xml:
+  Bump and fix bug #456166. Thanks to slepnoga.
 
 *sugarcrm-6.5.9 (13 Jan 2013)
 
diff --git a/www-apps/sugarcrm/metadata.xml b/www-apps/sugarcrm/metadata.xml
index 452f0ad0ece9..688f366ec350 100644
--- a/www-apps/sugarcrm/metadata.xml
+++ b/www-apps/sugarcrm/metadata.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>proxy-maintainers</herd>
 <maintainer>
diff --git a/www-apps/sugarcrm/sugarcrm-6.5.1.ebuild b/www-apps/sugarcrm/sugarcrm-6.5.1.ebuild
deleted file mode 100644
index 0c185f3b64d7..000000000000
--- a/www-apps/sugarcrm/sugarcrm-6.5.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/sugarcrm/sugarcrm-6.5.1.ebuild,v 1.1 2012/10/24 14:19:07 maksbotan Exp $
-
-EAPI="2"
-
-MY_PN="SugarCE"
-
-inherit webapp eutils
-
-DESCRIPTION="A complete CRM and groupware system for businesses of all sizes."
-HOMEPAGE="http://www.sugarforge.org/"
-SRC_URI="mirror://sourceforge/project/sugarcrm/SugarCRM%20Release%20Archive/SugarCRM%206.5.X/SugarCommunityEdition-${PV}/${MY_PN}-${PV}.zip"
-
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86"
-IUSE="curl imap +json +zlib +mysql +mysqli freetds ldap mssql"
-
-DEPEND=">=dev-lang/php-5.2.10[ssl,soap,unicode,xml,session,tokenizer,ldap?,mssql?,mysql?,mysqli?,zlib?,curl?,imap?,json?]
-		dev-php/PEAR-DB
-		dev-php/PEAR-Cache_Lite
-		dev-php/PEAR-Mail_Mime
-		virtual/httpd-cgi
-		freetds? ( >=dev-db/freetds-0.64
-					mssql? ( >=dev-db/freetds-0.64[mssql] ) )
-		app-arch/unzip"
-
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_PN}-Full-${PV}"
-
-src_install () {
-	webapp_src_preinst
-
-	cd "${S}"
-	einfo "Installing main files"
-	cp -R . "${D}/${MY_HTDOCSDIR}"
-
-	webapp_configfile "${MY_HTDOCSDIR}"/config.php
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	for foo in cache custom data modules include ; do
-		webapp_serverowned -R "${MY_HTDOCSDIR}"/"${foo}"  || die
-
-	done
-
-	webapp_serverowned "${MY_HTDOCSDIR}"/config.php
-
-	elog "Please make adjustment of your php.ini or .htaccess file"
-	elog "Change value \"session.path = \"  according to your desire"
-	elog "Files of sessions are stored in this directory"
-	elog "For more info see http://developers.sugarcrm.com/documentation.php"
-
-	webapp_postinst_txt en "${FILESDIR}/"postinstall-en.txt
-	webapp_src_install
-}
diff --git a/www-apps/sugarcrm/sugarcrm-6.4.5.ebuild b/www-apps/sugarcrm/sugarcrm-6.5.10.ebuild
index fe87b1f00925..172e681b687c 100644
--- a/www-apps/sugarcrm/sugarcrm-6.4.5.ebuild
+++ b/www-apps/sugarcrm/sugarcrm-6.5.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/sugarcrm/sugarcrm-6.4.5.ebuild,v 1.1 2012/09/10 14:55:47 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/sugarcrm/sugarcrm-6.5.10.ebuild,v 1.1 2013/03/28 14:43:03 maksbotan Exp $
 
 EAPI="2"
 
@@ -10,13 +10,13 @@ inherit webapp eutils
 
 DESCRIPTION="A complete CRM and groupware system for businesses of all sizes."
 HOMEPAGE="http://www.sugarforge.org/"
-SRC_URI="mirror://sourceforge/project/sugarcrm/2%20-%20SugarCRM%206.4.X/SugarCommunityEdition-6.4.X/${MY_PN}-${PV}.zip"
+SRC_URI="mirror://sourceforge/project/${PN}/1%20-%20SugarCRM%206.5.X/SugarCommunityEdition-6.5.X/SugarCE-${PV}.zip"
 
 LICENSE="GPL-3"
 KEYWORDS="~amd64 ~x86"
 IUSE="curl imap +json +zlib +mysql +mysqli freetds ldap mssql"
 
-DEPEND=">=dev-lang/php-5.2.10[ssl,soap,unicode,xml,session,tokenizer,ldap?,mssql?,mysql?,mysqli?,zlib?,curl?,imap?,json?]
+DEPEND=">=dev-lang/php-5.2.10[ssl,soap,unicode,xml,session,tokenizer,zip,ldap?,mssql?,mysql?,mysqli?,zlib?,curl?,imap?,json?]
 		dev-php/PEAR-DB
 		dev-php/PEAR-Cache_Lite
 		dev-php/PEAR-Mail_Mime
@@ -39,12 +39,13 @@ src_install () {
 	webapp_configfile "${MY_HTDOCSDIR}"/config.php
 	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
 
-	for foo in cache custom data modules include ; do
+	for foo in cache custom data modules include upload; do
 		webapp_serverowned -R "${MY_HTDOCSDIR}"/"${foo}"  || die
 
 	done
 
 	webapp_serverowned "${MY_HTDOCSDIR}"/config.php
+	webapp_serverowned "${MY_HTDOCSDIR}"/config_override.php
 
 	elog "Please make adjustment of your php.ini or .htaccess file"
 	elog "Change value \"session.path = \"  according to your desire"