[gentoo-commits] gentoo-x86 commit in net-im/psi: psi-9999.ebuild metadata.xml ChangeLog

[Peter Volkov (pva)]

pva         10/11/28 18:41:26

  Modified:             psi-9999.ebuild metadata.xml ChangeLog
  Log:
  Fixed debug USE flag, update svn paths, thank Nikoli for this job.
  
  (Portage version: 2.1.9.24/cvs/Linux x86_64)

Revision  Changes    Path
1.9                  net-im/psi/psi-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/psi-9999.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/psi-9999.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/psi-9999.ebuild?r1=1.8&r2=1.9

Index: psi-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/psi/psi-9999.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- psi-9999.ebuild	16 Nov 2010 20:15:46 -0000	1.8
+++ psi-9999.ebuild	28 Nov 2010 18:41:26 -0000	1.9
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-9999.ebuild,v 1.8 2010/11/16 20:15:46 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-9999.ebuild,v 1.9 2010/11/28 18:41:26 pva Exp $
 
 EAPI="2"
 
@@ -11,7 +11,7 @@
 LANGS_URI="git://pv.et-inf.fho-emden.de/git/psi-l10n"
 
 ESVN_DISABLE_DEPENDENCIES="true"
-ESVN_REPO_URI="http://psi-dev.googlecode.com/svn/trunk"
+ESVN_REPO_URI="http://psi-dev.googlecode.com/svn/trunk/patches"
 ESVN_PROJECT="psiplus"
 
 inherit eutils qt4-r2 multilib git subversion
@@ -21,7 +21,7 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="crypt dbus doc enchant extras jingle iconsets spell ssl xscreensaver powersave
+IUSE="crypt dbus debug doc enchant extras jingle iconsets spell ssl xscreensaver powersave
 plugins -whiteboarding webkit"
 
 RDEPEND=">=x11-libs/qt-gui-4.4:4[qt3support,dbus?]
@@ -41,8 +41,9 @@
 		${SUBVERSION_DEPEND}
 		sys-devel/qconf
 	)
-	doc? ( app-doc/doxygen )"
-
+	doc? ( app-doc/doxygen )
+	dev-util/pkgconfig
+"
 PDEPEND="crypt? ( app-crypt/qca-gnupg:2 )
 	jingle? (
 		net-im/psimedia
@@ -59,21 +60,20 @@
 	done
 
 	if use extras; then
-		ewarn
+		echo
 		ewarn "You're about to build heavily patched version of Psi called Psi+."
 		ewarn "It has really nice features but still is under heavy development."
 		ewarn "Take a look at homepage for more info: http://code.google.com/p/psi-dev"
 		ewarn "If you wish to disable some patches just put"
 		ewarn "MY_EPATCH_EXCLUDE=\"list of patches\""
 		ewarn "into /etc/portage/env/${CATEGORY}/${PN} file."
-		ewarn
+		echo
 		ewarn "Note: some patches depend on other. So if you disabled some patch"
 		ewarn "and other started to fail to apply, you'll have to disable patches"
 		ewarn "that fail too."
-		ebeep
 
 		if use iconsets; then
-			ewarn
+			echo
 			ewarn "Some artwork is from open source projects, but some is provided 'as-is'"
 			ewarn "and has not clear licensing."
 			ewarn "Possibly this build is not redistributable in some countries."
@@ -100,13 +100,13 @@
 	done
 
 	if use extras; then
-		S="${WORKDIR}/patches" subversion_fetch "${ESVN_REPO_URI}/patches"
+		S="${WORKDIR}/patches" subversion_fetch
 		if use iconsets; then
-			subversion_fetch "${ESVN_REPO_URI}/iconsets" "iconsets"
+			subversion_fetch "${ESVN_REPO_URI%patches}iconsets" "iconsets"
 		else
 			for x in activities affiliations clients moods roster system; do
-				ESVN_PROJECT="psiplus/${x}"
-				subversion_fetch "${ESVN_REPO_URI}/iconsets/${x}/default" "iconsets/${x}/default"
+				ESVN_PROJECT="psiplus/${x}" \
+				subversion_fetch "${ESVN_REPO_URI%patches}iconsets/${x}/default" "iconsets/${x}/default"
 			done
 		fi
 	fi
@@ -146,7 +146,9 @@
 			--qtdir=/usr
 			--disable-bundled-qca
 			--disable-growl
+			--no-separate-debug-info
 			$(use dbus || echo '--disable-qdbus')
+			$(use debug && echo '--debug')
 			$(use spell && {
 				use enchant && echo '--disable-aspell' || echo '--disable-enchant'
 				} || echo '--disable-aspell --disable-enchant')



1.10                 net-im/psi/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/metadata.xml?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/metadata.xml?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/metadata.xml?r1=1.9&r2=1.10

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/psi/metadata.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- metadata.xml	22 Jul 2010 13:30:33 -0000	1.9
+++ metadata.xml	28 Nov 2010 18:41:26 -0000	1.10
@@ -5,6 +5,10 @@
 <maintainer>
   <email>pva@g.o</email>
 </maintainer>
+<maintainer>
+  <email>nikoli@×××××××.com</email>
+  <name>Nikoli</name>
+</maintainer>
 <longdescription>Psi is a very good jabber client that uses QT</longdescription>
 <use>
 	<flag name='enchant'>Use enchant spell engine instead of aspell</flag>



1.203                net-im/psi/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/ChangeLog?rev=1.203&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/ChangeLog?rev=1.203&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/ChangeLog?r1=1.202&r2=1.203

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -r1.202 -r1.203
--- ChangeLog	16 Nov 2010 20:15:46 -0000	1.202
+++ ChangeLog	28 Nov 2010 18:41:26 -0000	1.203
@@ -1,6 +1,9 @@
 # ChangeLog for net-im/psi
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.202 2010/11/16 20:15:46 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.203 2010/11/28 18:41:26 pva Exp $
+
+  28 Nov 2010; Peter Volkov <pva@g.o> psi-9999.ebuild, metadata.xml:
+  Fixed debug USE flag, update svn paths, thank Nikoli for this job.
 
   16 Nov 2010; Peter Volkov <pva@g.o> psi-9999.ebuild:
   Some icons were not installed, thank Nikoli for this job.