From 3e85f08a4e27c605959991bba6fe2d94444933d7 Mon Sep 17 00:00:00 2001
From: Maxim Koltsov <maksbotan@gentoo.org>
Date: Wed, 4 Jul 2012 19:49:52 +0000
Subject: Disable adding _d suffix with USE=debug

(Portage version: 2.1.11.4/cvs/Linux x86_64)
---
 net-libs/qxmpp/ChangeLog              |  8 +++++++-
 net-libs/qxmpp/qxmpp-0.3.61-r1.ebuild | 27 ---------------------------
 net-libs/qxmpp/qxmpp-0.3.61-r2.ebuild | 33 +++++++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 28 deletions(-)
 delete mode 100644 net-libs/qxmpp/qxmpp-0.3.61-r1.ebuild
 create mode 100644 net-libs/qxmpp/qxmpp-0.3.61-r2.ebuild

(limited to 'net-libs')

diff --git a/net-libs/qxmpp/ChangeLog b/net-libs/qxmpp/ChangeLog
index 9d9d5e0f3671..d81c0750286e 100644
--- a/net-libs/qxmpp/ChangeLog
+++ b/net-libs/qxmpp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/qxmpp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/qxmpp/ChangeLog,v 1.11 2012/07/03 15:32:50 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/qxmpp/ChangeLog,v 1.12 2012/07/04 19:49:52 maksbotan Exp $
+
+*qxmpp-0.3.61-r2 (04 Jul 2012)
+
+  04 Jul 2012; Maxim Koltsov <maksbotan@gentoo.org> +qxmpp-0.3.61-r2.ebuild,
+  -qxmpp-0.3.61-r1.ebuild:
+  Disable adding _d suffix with USE=debug
 
 *qxmpp-0.3.61-r1 (03 Jul 2012)
 
diff --git a/net-libs/qxmpp/qxmpp-0.3.61-r1.ebuild b/net-libs/qxmpp/qxmpp-0.3.61-r1.ebuild
deleted file mode 100644
index 50cd9876bc34..000000000000
--- a/net-libs/qxmpp/qxmpp-0.3.61-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/qxmpp/qxmpp-0.3.61-r1.ebuild,v 1.1 2012/07/03 15:32:50 maksbotan Exp $
-
-EAPI=3
-
-inherit multilib qt4-r2
-
-DESCRIPTION="A cross-platform C++ XMPP client library based on the Qt framework."
-HOMEPAGE="http://code.google.com/p/qxmpp/"
-SRC_URI="mirror://github/0xd34df00d/qxmpp-dev/${P}-extras.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +extras"
-
-DEPEND="x11-libs/qt-core
-		x11-libs/qt-gui
-		media-libs/speex"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/01_enable_shared_linking.patch )
-
-src_configure(){
-	eqmake4 "${S}"/qxmpp.pro "PREFIX=/usr" "LIBDIR=$(get_libdir)"
-}
diff --git a/net-libs/qxmpp/qxmpp-0.3.61-r2.ebuild b/net-libs/qxmpp/qxmpp-0.3.61-r2.ebuild
new file mode 100644
index 000000000000..3e373da769e0
--- /dev/null
+++ b/net-libs/qxmpp/qxmpp-0.3.61-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/qxmpp/qxmpp-0.3.61-r2.ebuild,v 1.1 2012/07/04 19:49:52 maksbotan Exp $
+
+EAPI=3
+
+inherit multilib qt4-r2
+
+DESCRIPTION="A cross-platform C++ XMPP client library based on the Qt framework."
+HOMEPAGE="http://code.google.com/p/qxmpp/"
+SRC_URI="mirror://github/0xd34df00d/qxmpp-dev/${P}-extras.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +extras"
+
+DEPEND="x11-libs/qt-core
+		x11-libs/qt-gui
+		media-libs/speex"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/01_enable_shared_linking.patch )
+
+src_prepare() {
+	#Disable silly debug library '_d' suffix
+	sed -e 's/qxmpp-lc_d/qxmpp-lc/' -i qxmpp.pri || die "sed faild"
+	qt4-r2_src_prepare
+}
+
+src_configure(){
+	eqmake4 "${S}"/qxmpp.pro "PREFIX=/usr" "LIBDIR=$(get_libdir)"
+}
-- 
cgit v1.2.3-65-gdbad