Fixed debug USE flag, update svn paths, thank Nikoli for this job.

Package-Manager: portage-2.1.9.24/cvs/Linux x86_64

4 files changed, 26 insertions, 17 deletions

diff --git a/net-im/psi/ChangeLog b/net-im/psi/ChangeLog
index b74763a853e7..9623b6f7cbd6 100644
--- a/net-im/psi/ChangeLog
+++ b/net-im/psi/ChangeLog
@@ -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@gentoo.org> psi-9999.ebuild, metadata.xml:
+  Fixed debug USE flag, update svn paths, thank Nikoli for this job.
 
   16 Nov 2010; Peter Volkov <pva@gentoo.org> psi-9999.ebuild:
   Some icons were not installed, thank Nikoli for this job.
diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest
index 8f25d86064b5..9cec1f6863d1 100644
--- a/net-im/psi/Manifest
+++ b/net-im/psi/Manifest
@@ -8,6 +8,6 @@ DIST psi-extra-patches-r1428.tar.bz2 131700 RMD160 071eadf3a174f392cfb7202a85d20
 DIST psi-langs-20090217.tar.bz2 641414 RMD160 03e95fc690aa0e1ea49b7ac277ef0ecea91285f8 SHA1 de5e149d6fc55a464af6e614121b8c228b6e1432 SHA256 59f17d6547e4c911e83199fcd3908fa1bf4db312ae25d2c14e27d4c536915f9c
 EBUILD psi-0.12.1.ebuild 2540 RMD160 f2172d73dfa757827ae488ca1e29c8a5ef9dd806 SHA1 3b9cfb761279c1edcc2964e5c3229b4206131c42 SHA256 02542f49f8e819b74b5589a11a74bd296c594b7f9d55a9633d97512ad55751ac
 EBUILD psi-0.14-r1.ebuild 4674 RMD160 9adb8a3f9037b4d1fc1b3191b2cfd3f6ad5d8399 SHA1 37f1d157e8062a218acaf69605e521dbf8efc649 SHA256 b8a329157a633de17275eefb708b3782ed726dabd20f722de53032e8caffbcb9
-EBUILD psi-9999.ebuild 5928 RMD160 2aa557ebb2af18a971ffc1905929f7052ce26fcb SHA1 122c48e5c56a5eb9892c8e77f540311b2d9ec509 SHA256 0c4153b7d92ecd6f4e042dae70695a90066ed18b28f30a4185478672a56fcb90
-MISC ChangeLog 29722 RMD160 7d63878c62ae61b1bf737f6df8c208d25911da7a SHA1 b3589527956be5a03aeaadedf7a02d014a2e06b8 SHA256 1897783556153cc3c9c8e79e0b86997655110c5a0cfc785eb71297a7d8c24801
-MISC metadata.xml 960 RMD160 cfce93f79d31312766dc032e8e8048257c6c6c20 SHA1 350e509ebe61ef54d84f746ae476bee193e3f142 SHA256 20ad2c00b98454d11f2f3ae270dfc1d3ead80c0cf86594b466970d6337cc4650
+EBUILD psi-9999.ebuild 6002 RMD160 c74315a52540d12e30ea5c2fbd3e102f4f7b6560 SHA1 6b56bc85cc72985f76fab132725e91df59e7ea5b SHA256 c4e4deea68b70474c727d963f0f2a411620af6de60c0cba1ef12aa97789a4c76
+MISC ChangeLog 29868 RMD160 6b3ae79887f8cb68fd00b3d78e1e1a5f62711819 SHA1 3b298c0d4fb60541d26e3b2e4093fc9da3ecc672 SHA256 cf8aad786f834b923d1b6b57aac8db097953e2f72bcf8c5ebdf27d27e9b1b31a
+MISC metadata.xml 1045 RMD160 41a67d4b456737917e90945bfd1ca1798603b7dd SHA1 38066b4c6e461321d33471202cc212d56aa8f463 SHA256 2d2db4b3989de29ab27080da8e7d4301b4b6a85a1f55a405a17de10d93a92be2
diff --git a/net-im/psi/metadata.xml b/net-im/psi/metadata.xml
index bdd6d2f97ebd..9f4d73a670e7 100644
--- a/net-im/psi/metadata.xml
+++ b/net-im/psi/metadata.xml
@@ -5,6 +5,10 @@
 <maintainer>
   <email>pva@gentoo.org</email>
 </maintainer>
+<maintainer>
+  <email>nikoli@lavabit.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>
diff --git a/net-im/psi/psi-9999.ebuild b/net-im/psi/psi-9999.ebuild
index 84d715ae225b..0a8e60d9c124 100644
--- a/net-im/psi/psi-9999.ebuild
+++ b/net-im/psi/psi-9999.ebuild
@@ -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 @@ EGIT_HAS_SUBMODULES=1
 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 @@ HOMEPAGE="http://psi-im.org/"
 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 @@ DEPEND="${RDEPEND}
 		${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 @@ pkg_setup() {
 	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 @@ src_unpack() {
 	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 @@ src_configure() {
 			--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')