Version bump, remove old.

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key 17A85C72)

4 files changed, 31 insertions, 91 deletions

diff --git a/net-ftp/qshare/ChangeLog b/net-ftp/qshare/ChangeLog
index 5db339471793..993c5308a8a1 100644
--- a/net-ftp/qshare/ChangeLog
+++ b/net-ftp/qshare/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-ftp/qshare
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/qshare/ChangeLog,v 1.16 2012/11/20 20:09:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/qshare/ChangeLog,v 1.17 2012/12/25 09:46:18 pesa Exp $
+
+*qshare-2.1.5 (25 Dec 2012)
+
+  25 Dec 2012; Davide Pesavento <pesa@gentoo.org> +qshare-2.1.5.ebuild,
+  -qshare-2.1.2.ebuild, -qshare-2.1.3.ebuild:
+  Version bump, remove old.
 
   20 Nov 2012; Agostino Sarubbo <ago@gentoo.org> qshare-2.1.4.ebuild:
   Stable for x86, wrt bug #441442
diff --git a/net-ftp/qshare/qshare-2.1.2.ebuild b/net-ftp/qshare/qshare-2.1.2.ebuild
deleted file mode 100644
index 81fa7de981c6..000000000000
--- a/net-ftp/qshare/qshare-2.1.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/qshare/qshare-2.1.2.ebuild,v 1.4 2012/04/14 11:40:38 ago Exp $
-
-EAPI=4
-
-LANGS="en es fr ru"
-
-inherit eutils qt4-r2
-
-DESCRIPTION="FTP server with a service discovery feature"
-HOMEPAGE="http://www.zuzuf.net/qshare/"
-SRC_URI="http://www.zuzuf.net/qshare/files/${P}-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="net-dns/avahi[mdnsresponder-compat]
-	x11-libs/qt-core:4
-	x11-libs/qt-gui:4
-	x11-libs/qt-webkit:4"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	sed -i -e "s:i18n:usr\/share\/${PN}\/translations:" src/config.cpp \
-		|| die "failed to fix translations path"
-
-	# Respect CXXFLAGS, bug 411445
-	sed -i -e '/^QMAKE_CXXFLAGS_RELEASE/d' ${PN}.pro || die
-
-	qt4-r2_src_prepare
-}
-
-src_install() {
-	dobin ${PN}
-	doicon icons/${PN}.png
-	make_desktop_entry /usr/bin/${PN} QShare ${PN} "Qt;Network;FileTransfer"
-	dodoc AUTHORS README
-	dohtml docs/*
-	for X in ${LINGUAS}; do
-		for Z in ${LANGS}; do
-			if [[ ${X} == ${Z} ]]; then
-				insinto /usr/share/${PN}/translations/
-				doins i18n/${PN}_${X}.qm
-			fi
-		done
-	done
-}
diff --git a/net-ftp/qshare/qshare-2.1.3.ebuild b/net-ftp/qshare/qshare-2.1.3.ebuild
deleted file mode 100644
index 0f4253b60b60..000000000000
--- a/net-ftp/qshare/qshare-2.1.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/qshare/qshare-2.1.3.ebuild,v 1.2 2012/04/10 14:29:36 pesa Exp $
-
-EAPI=4
-
-inherit eutils qt4-r2
-
-DESCRIPTION="FTP server with a service discovery feature"
-HOMEPAGE="http://www.zuzuf.net/qshare/"
-SRC_URI="http://www.zuzuf.net/qshare/files/${P}-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="net-dns/avahi[mdnsresponder-compat]
-	x11-libs/qt-core:4
-	x11-libs/qt-gui:4
-	x11-libs/qt-webkit:4"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	# Respect CXXFLAGS, bug 411445
-	sed -i -e '/^QMAKE_CXXFLAGS_RELEASE/d' ${PN}.pro || die
-
-	qt4-r2_src_prepare
-}
-
-src_install() {
-	dobin ${PN}
-	doicon icons/${PN}.png
-	make_desktop_entry /usr/bin/${PN} QShare ${PN} "Qt;Network;FileTransfer"
-	dodoc AUTHORS README
-}
diff --git a/net-ftp/qshare/qshare-2.1.5.ebuild b/net-ftp/qshare/qshare-2.1.5.ebuild
new file mode 100644
index 000000000000..828b98a46583
--- /dev/null
+++ b/net-ftp/qshare/qshare-2.1.5.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/qshare/qshare-2.1.5.ebuild,v 1.1 2012/12/25 09:46:18 pesa Exp $
+
+EAPI=4
+
+inherit eutils cmake-utils
+
+DESCRIPTION="FTP server with a service discovery feature"
+HOMEPAGE="http://www.zuzuf.net/qshare/"
+SRC_URI="http://www.zuzuf.net/qshare/files/${P}-src.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="net-dns/avahi[mdnsresponder-compat]
+	x11-libs/qt-core:4
+	x11-libs/qt-gui:4
+	x11-libs/qt-webkit:4"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS README )