Version bump (bug #488600). Thanks Branko. Drop old

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x762053D5

4 files changed, 21 insertions, 43 deletions

diff --git a/sci-electronics/geda/ChangeLog b/sci-electronics/geda/ChangeLog
index d8e4f0665a28..d7b729b189e8 100644
--- a/sci-electronics/geda/ChangeLog
+++ b/sci-electronics/geda/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-electronics/geda
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/geda/ChangeLog,v 1.80 2013/03/13 10:58:32 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/geda/ChangeLog,v 1.81 2013/10/20 10:26:50 tomjbe Exp $
+
+*geda-1.8.2 (20 Oct 2013)
+
+  20 Oct 2013; Thomas Beierlein <tomjbe@gentoo.org> -geda-1.6.2.ebuild,
+  +geda-1.8.2.ebuild, -files/geda-1.6.2-correct_glib_include.patch:
+  Version bump (bug #488600). Thanks Branko. Drop old
 
   13 Mar 2013; Agostino Sarubbo <ago@gentoo.org> geda-1.8.1.ebuild:
   Stable for ppc, wrt bug #461560
diff --git a/sci-electronics/geda/Manifest b/sci-electronics/geda/Manifest
index 460546838590..cf1999ba421c 100644
--- a/sci-electronics/geda/Manifest
+++ b/sci-electronics/geda/Manifest
@@ -1,27 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX geda-1.6.2-correct_glib_include.patch 407 SHA256 5e145501b29cc3924a2366cc92d62485816bc9a57cfdaed861ce89e0fca93037 SHA512 e7de654853051b96ac354e7cb8c0e5600fea803ad1b8781c797601c0fff2ec10ea8eea95c0aabc56fa1fb21f500d60e77187a30fc811e59580d49425acaac021 WHIRLPOOL 98f1e8c56a7015f9af24774e8f1e6e433b4d5e1303208546883ffef8a58b50070c2bbdba846b78c87a11c34a1be3390715acc030a1459d74457c1f62e0b40ed9
-DIST geda-gaf-1.6.2.tar.gz 7099981 SHA256 507ee440ad976a534beab205231840468004366d471c17a211ffbdcbc24a6d2b SHA512 53205acee5612ac9287e09f0fb64a5c822dc7ae820ff040cfc9c1ee6e51c11a9b47e82adfa51da68cfbf7afb33b301dacb81deee48dc563b8671f2e168e6fc52 WHIRLPOOL ba0fb6311fcab7d12d114c8960b28ec2cc05b68971d3933cfb6996c6ecd8add624f3f3d87fd2835a463ae615ace91a6f50586450d52c0dea70eb6bac42f3ad18
 DIST geda-gaf-1.8.1.tar.gz 11197244 SHA256 026888ce21cb83a3543a7554de0ddc610cc8dc6ce2341df17c5b3305d6dcbb10 SHA512 16f88af81d514c3504625765c64ad1d2a45d3da6a4c75f68db30f51776ff56d907ce97fb69e39cc6347ee9bfa4b591a62240fec6cfc73c0f54b61285e118b35b WHIRLPOOL da6743d97428deb81dd80dad9ca2f8476643f21bb34386681e54edd1dccb241f5d016d8b3d1640a80aaab1233a1cc23f835fc340955b1524d2085cc5b50abc71
-EBUILD geda-1.6.2.ebuild 1813 SHA256 e852d5e693df239f321d4768b2deb7accab1fe3d99a67ecda4d13456d8dac7ed SHA512 41e79fae8a0c6914b3633efd9ebd57a67d35278698c83a4c4182f037987ce8423e5ef5d55aa245d26e26fd0cd7cd164594be7dd98e4f8c0e66c3caf2a7a6f94e WHIRLPOOL 4dd870a2562e8937e438df5d5e25e09a918924178c8132843161cbc343f7ac0549c5cd6a1e09c4590b4edfd367200bba359dbbf1cf0bee0696ae396d56751d90
+DIST geda-gaf-1.8.2.tar.gz 11282353 SHA256 bbf4773aef1b5a51a8d6f4c3fa288c047340cc62dd6e14d7928fcc6e4051b721 SHA512 3a6fad455c3fd2b62e9788ff04ca33242f2e4701ec24089d8c4304ad5ca44af4901fc1c396b3f840e14a0be0729ff08561a82c6911e1d23ac4b8636534b4e764 WHIRLPOOL e4e6db1b7f6d2f37d99027f9a55797f7ac5a304bb4be474d6d57091121672a86e8dfa5131e830f9bc6335f57cb3864716ef17793b550b0df064e9d2c2b158038
 EBUILD geda-1.8.1.ebuild 1785 SHA256 8b2ca7b4892625eb2cafc043b425bc0882c96fa6292fa8b888fdfdc7e6a80064 SHA512 846f0f3d1bd3820e577f23fa9813f5e32d77818d6abfc2a0c302062401e2d0b92d450f70256c619bc21c57fa5ace85c710b42d95d6f4faf6388406ee9eb00197 WHIRLPOOL 19acfd96ea65e5d067b85d192df240fdd814da886910da0ddc6c1e0dcf6f1e39d09032bc7b6312bcd889c30575efb13e3179e6ca2870e4b33956f536eb7205a9
-MISC ChangeLog 11719 SHA256 182948651634a0f273f87a286d2d184507039b211c30fd1319a838783f8febc2 SHA512 f6e547a387ccdfeb2dfbe47edb7dbb0e04276396cc3a4357b5ac08e0092c5505bb7540ca101e1747d1f20a719d7c77e7e2947d01ef89151eec5731ed0a389231 WHIRLPOOL d917a8abca128dc0f612edbf4f740dd73cec0840b8c762c55d17c0afe06cbb4d1b6d195fdccfe8d7ce32a7cbd1150bd9be6b8c428398ed69c73d574c4a43c0c9
+EBUILD geda-1.8.2.ebuild 1791 SHA256 a8901c54f62bd5ced3d96a9e20eb257224b8d3c20655f38055c181f8322090fb SHA512 17aa822ba085d71a0dac20430829d349f246ee648c96e347d4be58478221a95cf0f56c6fed9809e490e207ab7112ce824af64ff2ac1fc74a6fe03082ae7699d1 WHIRLPOOL 83390511643b3243fc08d43504a33847b2032c68e9d2a3ac7b0669e40622732c721232169fe6e5ba944f4edd7ecc64b4129a86d32f32d3b6f5076c0d7de8abf7
+MISC ChangeLog 11944 SHA256 70bbf119b3bc73f54387c2ce9f1c23437df0fdb9fae459ca6b637efafcffbcde SHA512 39274bd4a3c4ae6850d23315d913669f0c8d390418a577f5c939e5337e8cf31af4111b7b4e2b3e05fd4723684fe42090c39cd3cf38c278f1e385f5db262dedcf WHIRLPOOL 7fbb64a112705310a165357f885ba45d60023512c81523176eb906baee9e413cc5eff4a6406d95ce89ee00ce2120d9cfc0aeec99423d644674203d8741a3de10
 MISC metadata.xml 1008 SHA256 0a95314c82e8543fda8e9e95ad1b8097d183e482d278cfca5f082fa987e2838b SHA512 8c87d7613dab9204eac3c48e5cc584816c2d09b7b31d492641dd6d6c97a235a4fc91f22cb78777acb195cf44f6c1c03d05677b09fa790bc2e41c6fdcbf31471b WHIRLPOOL c13d17bc0855a616650d0bb3b2dfab199a267593f1d2a30729b016290fb27ba0002c2936d1621b806495a34d3da8ba6d857a154210427b42f447e88f600b36f7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRQFtLAAoJELp701BxlEWf1DMQALobHBZ75Lo553bfh+gOHWr5
-2crYfwiAmqCtxza8e+uCW+HEn5CzdnrIMta5yGTBBADP4iDzMzHnbI5EJS12HIF1
-+wKnyXQxe1aCScQJe3upFskD6TkmDdA7FLNJ7sVSWSRoiAECbLFG2vnA1GTkukj/
-hrSyb+jX39GQYkcWiEwCGOvuxVQi0Dk4tb1huLJNUM/xklQynxjy3yGZFXNrlcXC
-36A6XgbBEt3FaQKhWjI4TJVjRKpMi7fp/2k5n2Y5AFci69g/1TMsVfJN82ScAnsG
-mT2QCRfslmBRQD6VaKLWz5V60TQYqxRR2baFaER2tZpMEgvFcq17XrIgnR3RtTOJ
-ANT16gBEU1zfDAuu+5KgEaHAwjsAVHehMHiijJ8dSsooYiRcqpjHX4Kly2RxBcjk
-9HgPcVeHHVGYSOws7hCNyfjLzwOGRkBzCYIClnyWyl3UaM3j0CbZrQ7MgMhskyfP
-PFPNASiNgwvWvIDxnHWcB4wztn++ro4DuAIFEE6u8M4epKjn+l1dNRs8YSpAGXHH
-WkGGoehPp+sQ90qscLLH9MYwcMzauY2tqCthpQsjyrq4vpkZ7VtBe1ddQt/ofYlK
-B7JV6DvGsTfycfbPKIIFLq+5181AjBll2PR8d/60pl+8LXVaSi8loVNJyelpeWSN
-1JI80r3M1zUMHpg1HvMv
-=DV/p
+iEYEAREIAAYFAlJjr/YACgkQQe4uqXYgU9XkqQCdFnuRKU4wnoEcfdpvP1WlDgLf
+3qsAn0AITsYbovpVj3IY8gv2B7mGPWvW
+=1Wv4
 -----END PGP SIGNATURE-----
diff --git a/sci-electronics/geda/files/geda-1.6.2-correct_glib_include.patch b/sci-electronics/geda/files/geda-1.6.2-correct_glib_include.patch
deleted file mode 100644
index 2e77b7d4bc2b..000000000000
--- a/sci-electronics/geda/files/geda-1.6.2-correct_glib_include.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-http://pkgs.fedoraproject.org/gitweb/?p=geda-gaf.git;a=blob_plain;f=libgeda-references-to-glib-headers-other-than-glib-h.patch;hb=HEAD
-http://bugs.gentoo.org/395795
-
---- libgeda/src/s_path.c
-+++ libgeda/src/s_path.c
-@@ -37,9 +37,7 @@
- #include <stdlib.h>
- #include <string.h>
- 
--#include <glib/gmem.h>
--#include <glib/gmessages.h>
--#include <glib/gtypes.h>
-+#include <glib.h>
- 
- #include "libgeda_priv.h"
- 
diff --git a/sci-electronics/geda/geda-1.6.2.ebuild b/sci-electronics/geda/geda-1.8.2.ebuild
index 2b7b318c5890..d106a961ab59 100644
--- a/sci-electronics/geda/geda-1.6.2.ebuild
+++ b/sci-electronics/geda/geda-1.8.2.ebuild
@@ -1,19 +1,20 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/geda/geda-1.6.2.ebuild,v 1.9 2012/05/04 07:10:20 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/geda/geda-1.8.2.ebuild,v 1.1 2013/10/20 10:26:50 tomjbe Exp $
 
 EAPI=4
 inherit eutils fdo-mime gnome2-utils versionator
 
-MY_P=${PN}-gaf-${PV}
+MY_PN=${PN}-gaf
+MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="GPL Electronic Design Automation (gEDA):gaf core package"
 HOMEPAGE="http://www.gpleda.org/"
-SRC_URI="http://geda.seul.org/release/v$(get_version_component_range 1-2)/${PV}/${MY_P}.tar.gz"
+SRC_URI="http://ftp.geda-project.org/${MY_PN}/stable/v$(get_version_component_range 1-2)/${PV}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="debug doc examples nls stroke threads"
 
 CDEPEND="
@@ -39,8 +40,6 @@ S=${WORKDIR}/${MY_P}
 DOCS="AUTHORS NEWS README"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-correct_glib_include.patch
-
 	if ! use doc ; then
 		sed -i -e '/^SUBDIRS = /s/docs//' Makefile.in || die
 	fi