Version bump, remove old.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0x17A85C72

5 files changed, 54 insertions, 96 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/Manifest b/net-ftp/qshare/Manifest
index 25b8a54cca85..59f8afdf79c8 100644
--- a/net-ftp/qshare/Manifest
+++ b/net-ftp/qshare/Manifest
@@ -1,8 +1,26 @@
-DIST qshare-2.1.2-src.tar.gz 452915 SHA256 3cbbe2d4dc008ed69e858abc6c5eb30b36e71db78fb51e6c9a87debf933931c5 SHA512 5aa44f85ae1f613d7c1d247c0054e4f1705d9e44aac6939596dae9f083a927e120a7ace60d9eb05271e843d4da8c48ca1112e17b4f268f487df38728b20bfeae WHIRLPOOL 2199329c35c3062a505a002958d1f5f268d419f402f3c95c1eed24c9d37c21436fdd452c444384433899886a622f4ae6bf478e948a684a3ddfab14e0578a0a02
-DIST qshare-2.1.3-src.tar.gz 538705 SHA256 1895900f4a9209049963cae9dd4b956974de8f29a1ef1285a06d0348fe61480c
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST qshare-2.1.4-src.tar.bz2 772886 SHA256 9bf2b0f157ea556285a8617b9aada2ff0670adfba31dfadb6a48969833e04938 SHA512 934a8c394657ce7ad0697172f51d164d80b6ff61975966d9241d63e2ef35df979adfca1dcb61b34e3c92f6c4acd56f5cbf5a1783648fbf2dfdf808dbab312254 WHIRLPOOL eb29f5c902a295b2f84ae8cd9bb68e57159c7e5556be5face1cce15a6b4ecda9c2e92d401695d2a8d8ced1ee304ee3cc3d8e91117b41178b42a67cca2f0c639f
-EBUILD qshare-2.1.2.ebuild 1210 SHA256 ce0070340f30af9b4b8ce75642e2f1096dbf7437655879e5e29a4505fdfbb17f SHA512 ef745c66ff1d8cccd554b28a5d0cc33fc41f0c42fe5a42c37f06fbdeaeb271fd588804b31613abf262f3b12d809921c16a9378952bc848b8570219676d365021 WHIRLPOOL 91ec788fce782c4b612ad663a760e02a42c04fafd2419b733e513436ed1860f475531194e97426c41b828ee247437dc62a4c3c414a1d67d47a8c60237e6ce7ff
-EBUILD qshare-2.1.3.ebuild 892 SHA256 542dbfd32741dbdd33a0270e70188c6c2e8b2dda5c6f94ed3a4dbd1ac880db0c SHA512 b2dd886ed60df8ff5249dc5a6e1582120b8a2f6bc9ef61661cbf5a871ab40f65c463f99886f828e293d1289ce60a1c4d053d23032bd174c02d02f57f817f5eb4 WHIRLPOOL 2de13e20179a96e4d8d558d7c0caac7d2a80d5a97c86af1066910474e8b8dfafde9aa9f81eeeec272eda9607b3101b05317eeb53d212c0465cad9a41b73694b6
+DIST qshare-2.1.5-src.tar.bz2 770556 SHA256 9122ecd6f4b0091a24fe664ee6254ae16acada0e315b5e30bdf95828639fcde2 SHA512 5d1ca2ffaf93d1136a2549cb4b7525f4990182a53dbff0752d60c2d24b4022f4082d39c8df2758d97e3830bc59033da9018a80474f52dd83245a8830ec3b4c1f WHIRLPOOL d67e14a5dfaf230e43250ec3946e106d43d80177f696680c7672fdc29d03c292dbaf2e6ae7d98bdbae8dfd47c944309ec644a60eeb175ea2751c0665520a1cb8
 EBUILD qshare-2.1.4.ebuild 617 SHA256 85c3b9065e19d4089f0e51af9b2ac0b1caecc673577a6ae508e6d260b28a449c SHA512 beb0593a27abe5925abdeed82753fe75dd3133385faadf3dc1c71382c98a5d553750abab059307c1f556ab8248350d51b5e8a36449c1e93f4e2a094c9aa0b18e WHIRLPOOL 5ca118f61c22d322d7733320062c555e93743e705eec1b44ddea6862508b7b44e82011e66cc39f2bee0d5f26b50b2f54b3a5ad6d61fd92201d2730d67025ee0d
-MISC ChangeLog 2259 SHA256 ed1634877187305ab1ba4a19b3b9c02c67e94ffb9dadb659bd8bb2603845ccb5 SHA512 3b8ed4d2897b104ccf778a453d993a7d2f524c41037876047f8c0e0dcf1fc1ebbebb27e73dd2dfafefde5c5ec5d55bc193392e2059b383b8391a034621d3d465 WHIRLPOOL 08502931a7ca5c9925e5749ca43f8e5b2f96bcad69fa1254048cba18f99449e2dc25e2096137ef4cf2e24a62c2f70bd1490567f86e757c2b3dbb49ae85404a67
+EBUILD qshare-2.1.5.ebuild 620 SHA256 f1b085fb49ea03b8880653e06420baa8306b3e51831484a8ecd16d16cddd519f SHA512 4db32921f42c106efc03c8708ca33edcb3f85fbdb0fd401bd62cd2ed856ac6cf3ba3ac26addd1c9ca5636ac2055e30aeb6cdc3b03d18548b0bf4bceb4ed73812 WHIRLPOOL c71e6b4113291cb8a85e45079f0d8b4281796778605d59d06932ce2fe692be978e00591ec04fcb06f9393f6d7b7dc7650eb5f5dd92398d0d7d346452f0baf758
+MISC ChangeLog 2436 SHA256 9923fcc4fd85344402dc87c89096e682bfcb3d60fe7612978625c566d9995c03 SHA512 2429e7213dcb104e7daf943761897e9fb34db4765a7224f28c31593650f41d1a0fc2ff3e0a0600bd5507a30e88500268664006fc6f03b32bf946de838c2ce3fa WHIRLPOOL e99a2be729d02836993105f32fda6c9273ca4ed185e06fb5544ded1eadc380b577462a0a057679ded15b4bb865e8a1c61cad4b0bf80257fa0e927be9b62aa01d
 MISC metadata.xml 155 SHA256 94ed5876ef16dbc191744ff6b8939a0f428fcb8add316d898880e1c4c880b9e7 SHA512 f05c8982778167c3667c9246b9730ba49fec2967731ed2c615e31a7fddc220fcea8c0843caa70a14957c8c4910892c512b6f2e00a9724d65e6032e1289f4562a WHIRLPOOL 25ccd49f04da07c8525fe18b21229764bb4104938abefc6c953bf9caa533dd5c10ae7b3f80a1251182e6c1520c09383d9f1d0ac1dc74832a99299c9be27406c4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQ2XYJAAoJENXLsxwXqFxyMMAQAIYNxRBWlVIh5ms7584gSavb
+nkb0uGNJ1Fh3+i3BYP8zEe2V95mIak6GMNacsCqMr/eMJp7xtKiGcz3Vwx9xaxGP
+CJfaByDrPbAswMIAo8AggonefOAy98odyNhH7H7xjDJQRiW+01O0zYfEekMpQkts
+RYWZfHSTVqTyeWxg89sVK53sXF7K4u0DJ5wnPq4/fbQgHb+I+W3Jof8s8fG1m1Xq
+Jzz6mkRW6YZRQ3qDP9ADCqoqx0CtR3NKTaQAlwe0RjtIsaNpDXY2JzZmHDKh1RYH
+ELsYSnpB8Lc5bvzjQ8HhUIhrK+WV+SA9woP9j+v2hFpmEbfWy/CNY/g8mHQWDlUW
+5nFCZLcOXRrV/YdIqPwQmT2Gp5xSeN1No4SYWtPYStJnkFya7GRyki5RkGYsOzsk
+ho+XZTsqt3jGkL3xjt0BxFxQX2ygbMAW+w3AVAhPf02tAyYlKJfyDNWlObbuWwD5
+O+ZSGUT50h/wGrgHRQjjmiQMzAMPBfsfW/LEH/s0f8rRFV9GjppoPZd85AN+rqT8
+hITBa4dwhnwyczuVZSEXfUCeRuj+chuR/DNHC9l3yIv0Fvtw5d0DafCCtde6X3u+
+J8FJNTlixbyycRWvODTqRc6C4wTfxrbvF+JleeP3HlOyJtgBFdzqE8ScckvBF4Ne
+T8tQiKIZeSfCzM9xSv+Q
+=IyAv
+-----END PGP SIGNATURE-----
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 )