Remove version bump; freerdp master has issues.

Package-Manager: portage-2.2.0_alpha116/cvs/Linux x86_64

4 files changed, 13 insertions, 91 deletions

diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index 1c2b98d4823b..9ba247d507e0 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -2,16 +2,14 @@
 Hash: SHA256
 
 DIST freerdp-1.0.1_p20120318.tar.gz 3666002 SHA256 f03d8f7138d66e0fac192e6ac52e7507343d55953cf62f796e3a70a2fb989dc8 SHA512 5c6ef5997d2d378d3c8b0427587ac6484755d74e5c3c632846211a4b7f425f2ab7cf497c87956c7d492246bca2d41ee0d25f094ac57cd94153facfe81948af19 WHIRLPOOL 018c7ec55bad4bbd35e801e4d4368c80ffb92fb3b88d06522d5b39ca6b0ba8c7d0ab919ed138a18e1ab27900db88f6407e2b229ece1f8dbe9177d0bcfb07981c
-DIST freerdp-1.0.1_p20120704.tar.gz 3777540 SHA256 c23d669a69de24878a2863ee7915844f2ea6782ebc475946379511a407184225 SHA512 1583cd0cd5632e55fd523e9abf0986e791a6d010c6535d6c3d32f6708edba85fecba5ee0e2e9860ddaa00dbbb11a8d5db8f4cfe8ecf545f22dc21d3534e055ba WHIRLPOOL 4081f2293f2fc3c18c75d452256da7bba683e4c16412a5bae064a5b1d51165f8474c48bd90557aa1e8db5e72be92c0dd6c8c4ffeeaa43d23507fdb0b970e8a08
 EBUILD freerdp-1.0.1_p20120318.ebuild 2324 SHA256 af245a5efdf9aa172b55d0c4e3fcf6cba9e76bc9b83c9803209f83b127a3fea4 SHA512 25cfa816f41c6c0b32993008b81ba04deaa081bd3cd6d3c74b020e9b02d7110d76edaea3e23f4d50623bc0aff4218b719c753d91f3c43715eeb61afae46cf7c9 WHIRLPOOL 18e59a7b67499d05f7c918bd562ccb8d21a01920604d00df976d3b137d8fa2c5c3327a62fb7090dd51754604308e2f6f108235bd146405e790a0c63a893bbceb
-EBUILD freerdp-1.0.1_p20120704.ebuild 2302 SHA256 03a85b02dc3abb2fedf95c8a3186426cc4e90422a6217cb982d933292233620a SHA512 46626f21f0e3e5a24c602cd84e99c565fb2ce1b112a04548f7d191726c22e0cb5a2a527c8723c03412fdc3bbbba846ade1f3c83116b605b4f56deff92b070b4e WHIRLPOOL f87e64d6cdcca8411c44f048a9956d8229b1a19681fe3e1154d8d785e5ac1ef448ef1122e142802bf23c8a45dcf4521070b93d0118a052ba8a4047e9e7bd4d80
 EBUILD freerdp-9999.1.ebuild 2294 SHA256 426581a4d0b26f94292f1d766aa700d81a0af85484055aae2fae0c1240006537 SHA512 7ff7a5aa414d25b414cc6d20a9e78e2da30247561c7e502e519ff22ef754c63acf2abaf20e09eebb938535e634dec7262480a471d76625a8638ce62be9a7df3b WHIRLPOOL f4eab69357f7cfc4712eccfce8c7f9bf2bb6e5e124a46299945c378c049246a43fc516c95a392393af75cb465368a184c916a723a33271896439cac2c8cd3116
-MISC ChangeLog 4767 SHA256 9aad8d855594cbd4b1096a6f74c433cc6b35c543cbfcf6cee6a32c7ee0936fb8 SHA512 84d0647da3ae4aeb508150870489f6f21c8f9cc983b1defe9c662daf5f541bfd09f516aec570b982ade0594b0c1647e3df934acecbaf503da484bd6799ba2dd1 WHIRLPOOL 6a7d607cbfe204cfe9ae93697db2b42d1e4b66b093d2bc3d8cfdc7515d2eead2ee9e6435482486d980de88a825fe82efd8556122e3259805db0f33552ede092e
+MISC ChangeLog 4901 SHA256 ada21ffbe0ff6eb4d158aa21c2d5db0917d38e01e861248de835bfdc85005c4c SHA512 4b85dd179dfe80c09fde7ec61cd19012fefe6e5b744dae5aa2281979d09c64c3a634a3163936101511088d76df2df9cfdcc5fe22c995d527a30182d33cc5bda2 WHIRLPOOL 80642f4ae00a983349a39efffa87c558c1c57add0aea7d5c1a658f1d11cd2783cf7f61d6665f07d051fece6b3441bf64c6166b3578a49b30dce0efc6d0ebf898
 MISC metadata.xml 2216 SHA256 9d445af97daa3134494ff1b0fa823f5cf5c3bd08946c4ec77441b145b6cfaf36 SHA512 41ac444841f9a4afd11508c42f88a0a9af9259359272b4d03c5fb8cde7d6c9366666ccd16e59825372b7f5dbfbd324132ff278ed73c14449722af8185bf6d7c4 WHIRLPOOL 1c2da22d5e7b90318cc1b59d6b9010592f597e62d3abe94aba9f0aa3cf6287ac50178a426452e84f6c9793a6035a5413e89d7b4fc5d9c33a56d05b5902bf3b52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk/41WoACgkQC77qH+pIQ6TkAgEAnIEl7OKToZlJTJOTKqWbHFvR
-b8IQ0aSRWZFeZhpp/g8A/ieEr03zldUrQ3/hU94r1fa8RYRnOJvZma5IGI3QFciI
-=cwm0
+iF4EAREIAAYFAk/42qsACgkQC77qH+pIQ6TAewD8C4BCu/Fp8ztH97D7aGH227g/
+1wGXqNZSf1pss3VP6YgA/1S06WcACv5VqrJjVoAdUWRltETVR3HbwrBquKAIY3Nx
+=dUfe
 -----END PGP SIGNATURE-----
diff --git a/net-misc/remmina/ChangeLog b/net-misc/remmina/ChangeLog
index 901820b83b57..6948fd59d758 100644
--- a/net-misc/remmina/ChangeLog
+++ b/net-misc/remmina/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/remmina
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/remmina/ChangeLog,v 1.35 2012/07/08 00:37:54 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/remmina/ChangeLog,v 1.36 2012/07/08 00:55:34 floppym Exp $
+
+  08 Jul 2012; Mike Gilbert <floppym@gentoo.org>
+  -remmina-1.0.0_p20120529.ebuild:
+  Remove version bump; freerdp master has issues.
 
 *remmina-1.0.0_p20120529 (08 Jul 2012)
 
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index 76c466ac9afa..ca465f9f0a92 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -5,16 +5,14 @@ AUX remmina-1.0.0-desktop-file.patch 1514 SHA256 446fc318eb99a927ae0747e13aae812
 AUX remmina-1.0.0-fix-desktop-file.patch 1621 SHA256 5b90530dda689c553af151cfacc2a415c695a80a7c6e0d060d9af3a713dc9997 SHA512 339b866a44f8800d1dfdeb057ec764074e6e74d00e5d3e004071095e0b72531c8de83234a81a0784b62f7307bf5fd5b16e57a210648eb33eaccb6d77f033f750 WHIRLPOOL b102327cab6cf262fe629fcd0864dcc89c9f740bb10479f041986d84f097438e1182836a563fe9bd87c96343a2fcbdc9f373a501a7a457da417adc709eb3c58a
 AUX remmina-1.0.0-optional-gnome-keyring.patch 1645 SHA256 79caf815eac40c9e015228707bb2d20db82330b61efdaa3c91e26e04440e8e64 SHA512 58fc48d1e5604221cd79f50234b7d8a706bef912653772aa70520187207fe091583d2058c6ee66007b677b0cea0b1ea27307ae42dd5b2827f84f6ecb24dff4d2 WHIRLPOOL 369173ef489dc7d313cafe893bb2540e4f1ea55fb031ae6d2c44676fcdb23635cc00069bb2ae0a064f8876082865bcbc0417c2bdfbf8bbc9b66ce9012ce1375f
 DIST remmina-1.0.0_p20120309.tar.gz 404797 SHA256 43ce0de9f521aedd1b6b26ff6914de827a6ad4fcef82c4d9c3ed86ed9fd8c9ae SHA512 6f1f13916e1aa1350a29ca4bed9dc289ca5307b6a6e45851f25446531d257ae6fcf3fa1f663305b6a3896ed9a137777e68e4adb67ec6730e8c0d4d55fb93979a WHIRLPOOL d47f99f1ae95bfef7ec2b38b6f434832f6fd4933187599f7a5c3bc75df0ce34d02b1b78c2bdad68abc418c3fa35c8dfa4b07b433f15a85b124098300932e3c4c
-DIST remmina-1.0.0_p20120529.tar.gz 408597 SHA256 4b00963a0ed270676ac463fcb0e8988b4f637b2190d07dd1f8bc46faf8803511 SHA512 a231432db137ee4b9240650401cc280782eae3a02378d1fb090fa23605f57d1aa50d693fe32f236290ca5bfbccc035da1f4cc371408044e45a4c0862338920c7 WHIRLPOOL 45a1e1a8be7293e241ca2bc7817f9c5d56ac66ed33325417f33928f1a690683081d5f6b23311f57834a4a4071247e3ff5941e468130b0176f958aac7ff4f64aa
 EBUILD remmina-1.0.0_p20120309.ebuild 1872 SHA256 ba330dfcbbe6b376d46a798461a12c5e1e737b045cfa376b52908632bc35f426 SHA512 0296581ddf4ee8a9935e5c29bd736fbc387e3ecfd9a13ff26e76fdd9d32fbba00453d49ac5634489589abc513ca5030c980e738902ed81f75ff513062cbbe42a WHIRLPOOL 8c878269a67ef7323e625fafd0942131159112830a5705823900511e7b839d84bcff76a3a9511ae17e3ed00c66d89dbde2844383b0fc223dc3146f3e10fb2691
-EBUILD remmina-1.0.0_p20120529.ebuild 1873 SHA256 182c9b310d510fa35b6792efb5384207c78be8669128e72c6923316098b82db3 SHA512 e4584e30fd320655ee53d5a46c2229d39a27870cefdb0e60dd336bdd9049048cbbe551cf1f227548d9fde5e398c1a04c4c21e984cc89478eceefbcc7131398a6 WHIRLPOOL 9f47a4ddbfa8830fbe7a90775389e8e667e31c8920a9d11e46ddc144ae581807674901fe9895685cea32895ccb3e18a1377e95ccd6645358085032fd531a6b59
 EBUILD remmina-9999.ebuild 1863 SHA256 56e093c2c7ae606d5e5eb3b515cfef0e1cae66a81b31b4ab0b177e2b206f0832 SHA512 71d774837479b665417ecd5a156ab1ed8f1992907bafb5b4a8283ce85a3da6252a1c053c83166765aa6b0037476238d9f181568703f691f482e39bf8ab7ea9f3 WHIRLPOOL c1c5d4bccdb3f62ae874b4c0304a0a9fb44cd9d6ea053769ddda6773db489b9168b9962f89022ca0551f1dfbc1825f8dec60ab10cfcbea5256be80a64ee68425
-MISC ChangeLog 5529 SHA256 5dce0a04618ed06b0e5d63b3b02aff92ec2f35f6ac9907ef0401779b3f68e649 SHA512 dacdb7f1813907cde26aa79e509722b1f80f5024691ccb419be61d9a6a4232fca90717854347e41f024563c32226760c0fcd4c5d3c20110909c3fae037de2485 WHIRLPOOL e8e9f13e12f3c7dd83a8fcb878f921ffade9d2b1e492e94006c212caec9a5e298bec6c7e070285098282ec03129003b769d6688d74d345274657cea96797b05c
+MISC ChangeLog 5664 SHA256 021bce62a92db2a40916fd2f2ee82bea71e578772a630e407538e5484a21afff SHA512 089cb0b1703b9f58a04bf14b479238ab375bcf2851afd7c59327e0ac83e8b798d361af06aaa71c733012337df2d241146a20da06f7789d2fd7538162945db91c WHIRLPOOL dc9b38cc267877da16652491abc005cf50cf37d04dc942f0ba7fc48181a8e8d587531d8e8b8f74cd78ea52dff753e59027a3a5884184a0bafca6680079cbe328
 MISC metadata.xml 823 SHA256 923a1c1b265c367f5ce9e5be0e42f8ab4bc646a8e0c0c45a8496df9973cd3caf SHA512 56ea24da2e4212d15d4000473d402bb93df70569bb4279cf12a82250357d063b4c8aaf5180607af3140a9134e02d698a2b9d86121cb6a68ad2fee8c612499600 WHIRLPOOL 6e7e5248912168602557f9bd39e73059e0e8c275c51737483cb415011bd5f5d54d51e45d1c401475ee2cfb1ae37cc5098f3effaeddfe8b69f0094bdabb4814ff
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk/41mgACgkQC77qH+pIQ6SDewD9Fs2LvguzqASGMJ9bAOBMMTRC
-FIqfkVxTwm0yXzf+UrEBALyoO3UW/OyVAhRjx24NsPOSU5oKArotoqhRn4HJEb5S
-=HpfK
+iF4EAREIAAYFAk/42osACgkQC77qH+pIQ6S69AD/UV7G5kw6ls+yZl4g3mMRXdsq
+2SL4LMHAqlbbQBb33gcA/2GJE6GVXr7C+moHoduSUcFboviz6E3EZk8WWaZF7olc
+=SgnG
 -----END PGP SIGNATURE-----
diff --git a/net-misc/remmina/remmina-1.0.0_p20120529.ebuild b/net-misc/remmina/remmina-1.0.0_p20120529.ebuild
deleted file mode 100644
index 92854123eb2b..000000000000
--- a/net-misc/remmina/remmina-1.0.0_p20120529.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/remmina/remmina-1.0.0_p20120529.ebuild,v 1.1 2012/07/08 00:37:54 floppym Exp $
-
-EAPI="4"
-
-inherit gnome2-utils cmake-utils
-
-if [[ ${PV} != 9999 ]]; then
-	SRC_URI="mirror://github/FreeRDP/Remmina/${P}.tar.gz
-		mirror://gentoo/${P}.tar.gz
-		http://dev.gentoo.org/~floppym/distfiles/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-else
-	inherit git-2
-	SRC_URI=""
-	EGIT_REPO_URI="git://github.com/FreeRDP/Remmina.git"
-	KEYWORDS=""
-fi
-
-DESCRIPTION="A GTK+ RDP, VNC, XDMCP and SSH client"
-HOMEPAGE="http://remmina.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ayatana avahi crypt debug freerdp gnome-keyring nls ssh telepathy vte"
-
-RDEPEND="
-	x11-libs/gtk+:3
-	>=net-libs/libvncserver-0.9.8.2
-	x11-libs/libxkbfile
-	avahi? ( net-dns/avahi[gtk3] )
-	ayatana? ( dev-libs/libappindicator )
-	crypt? ( dev-libs/libgcrypt )
-	freerdp? ( >=net-misc/freerdp-1.0.1_p20120704 )
-	gnome-keyring? ( gnome-base/libgnome-keyring )
-	ssh? ( net-libs/libssh[sftp] )
-	telepathy? ( net-libs/telepathy-glib )
-	vte? ( x11-libs/vte:2.90 )
-"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-RDEPEND+="
-	!net-misc/remmina-plugins
-"
-
-DOCS=( README )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with ayatana APPINDICATOR)
-		$(cmake-utils_use_with avahi AVAHI)
-		$(cmake-utils_use_with crypt GCRYPT)
-		$(cmake-utils_use_with freerdp FREERDP)
-		$(cmake-utils_use_with gnome-keyring GNOMEKEYRING)
-		$(cmake-utils_use_with ssh LIBSSH)
-		$(cmake-utils_use_with telepathy TELEPATHY)
-		$(cmake-utils_use_with vte VTE)
-		-DGTK_VERSION=3
-		-DHAVE_PTHREAD=ON
-	)
-	cmake-utils_src_configure
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}