Drop old version.

Package-Manager: portage-2.1.9.44/cvs/Linux x86_64

4 files changed, 9 insertions, 241 deletions

diff --git a/sci-electronics/geda/ChangeLog b/sci-electronics/geda/ChangeLog
index ef161c4dead3..c738ad47d8c7 100644
--- a/sci-electronics/geda/ChangeLog
+++ b/sci-electronics/geda/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-electronics/geda
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/geda/ChangeLog,v 1.67 2011/03/25 19:36:28 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/geda/ChangeLog,v 1.68 2011/03/25 19:58:15 tomjbe Exp $
+
+  25 Mar 2011; Thomas Beierlein <tomjbe@gentoo.org> -geda-1.4.0-r1.ebuild,
+  -files/geda-gattrib-1.4.0-gtkentry.patch:
+  Drop old version.
 
   25 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org> geda-1.6.1.ebuild:
   ppc stable wrt #285470
diff --git a/sci-electronics/geda/Manifest b/sci-electronics/geda/Manifest
index 7f6fe938f868..3a993148a9f7 100644
--- a/sci-electronics/geda/Manifest
+++ b/sci-electronics/geda/Manifest
@@ -1,28 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX geda-gattrib-1.4.0-gtkentry.patch 4473 RMD160 67c7949c495c16cf842880c49e5f9f50e7258ff6 SHA1 7095f2785c361ff6facedaa59baac650592b7e0b SHA256 3e950ffdfd7c4cf649bec9e9d2bee62176cb382d0e032ae6b1a2de32d691abe3
-DIST geda-docs-1.4.0.tar.gz 1833377 RMD160 087d16a3cbaff1eb1a948e59ad6b87e950aa236f SHA1 d8b77a3f39fa324637314b62bdd56a7b2742f1a2 SHA256 383887369adbaede5dbfa7d46294ee840580dbc988bb8adcc101533af2e94741
-DIST geda-examples-1.4.0.tar.gz 257780 RMD160 46f7358ba440e040df3872dbd99c01f35d9fe74f SHA1 73895b572cbaf10eda563b8e8474dae9e833211f SHA256 4ee582fa9c8ea43090ca51afb4da6240998b2c7979a1df3d0de1239861776bb2
 DIST geda-gaf-1.6.1.tar.gz 7099085 RMD160 7274c898985fe097b0cfb87bd9910961e14d1150 SHA1 54f706f8ecb3638b0384c5428ef6089237847b6e SHA256 0f8aacb76dc669633369e215a21cca021814bf1a36e6a9b9f910fb4205b30998
 DIST geda-gaf-1.6.2.tar.gz 7099981 RMD160 4e32ba11188b9a2849036299b972c35481cb975e SHA1 87c21b3b77eebc8eec1c16672d4b1ab418ccb80d SHA256 507ee440ad976a534beab205231840468004366d471c17a211ffbdcbc24a6d2b
-DIST geda-gattrib-1.4.0.tar.gz 349998 RMD160 86b1e4dddca96203492f2094e4579a1361064e63 SHA1 96c9de3bebd26b76d0559b4ee848be2105035d5e SHA256 950399d1d61cdcb0eadbbcab604683bcfbf360794faa37e352c8db7f587bfc15
-DIST geda-gnetlist-1.4.0.tar.gz 402250 RMD160 4e2c295ae6033da05cdffd62c28c41c4a5443843 SHA1 494e4d9f323a935f6a858138101b5bed6788ce2f SHA256 92829056a0cbef5836f9e6e968e610347097cf852c97773269e62f1c0b7732fc
-DIST geda-gschem-1.4.0.tar.gz 1120760 RMD160 d7b8a05a5000f333102b9e286c8aac69223ae329 SHA1 0bdc4e350019f2193eda6f065277008538f06747 SHA256 86ec9177b12655966f806b441a010ef88d023c15256ebaced1d5f2930c86a252
-DIST geda-gsymcheck-1.4.0.tar.gz 169129 RMD160 22cdbb0e5e6e7a1afff40e1be6d069ddac0ccd3d SHA1 28af761573b682f93dff5936cc6d01458080239e SHA256 289a7518660df3d99959951ceabfc4d874919697bd261fc4dfaa4631adb7aad1
-DIST geda-symbols-1.4.0.tar.gz 833319 RMD160 f40c545c24b091296f6faf5b836cf9616a55ecbb SHA1 a4bb4ee080b5eb822dac42f6f983be6ec8e669c7 SHA256 59fd1faaaf27fb42ccd1fa532190ca8a1cfe102e092830af2cbaa6edce3034ab
-DIST geda-utils-1.4.0.tar.gz 322537 RMD160 212ac8d9975ddbe02ea774e1cb897a91d6f28f23 SHA1 725311fe02f6736f83f426c070e9fc40e42a231d SHA256 403df63e4a1254368979afa16b780efc1a5c5c34dad5d03806949ea8a0fbf48a
-EBUILD geda-1.4.0-r1.ebuild 3662 RMD160 f370acba181ddbc25bc131bf8069797e0b54b28f SHA1 baa2baa48b8eeebfcff1d2d44cfe93fae445b71d SHA256 2441920eeca2b2937d2f6b3ebb1a463d8b8bd3a47443f77b443de71a5a8ee8db
 EBUILD geda-1.6.1.ebuild 2195 RMD160 2511ae6f32ecdad1d9e7b88a0f0a3ffe68f98746 SHA1 472cb5851fe7da780ae2cd91c9da7530c066fae2 SHA256 2ba221462571b3018012756d20a38ed3d1160c0bdd7aa37c44774fcdcc6b6c7c
 EBUILD geda-1.6.2.ebuild 2193 RMD160 0272a4e10ca7fc29498ff77b2b32bc9b259942a5 SHA1 000d52d2ff32f57b1dc116bc1ced728b23ec3fa3 SHA256 b6f54bf67d3fefa164a40ba1491dd8dc6e4eb241bcfcc1664c216869ae514c4c
-MISC ChangeLog 10168 RMD160 559a0c883ff3d8e73b04189f4fe3cc6f47119d19 SHA1 33898b472420706e7d8deb10e27dce19efba3889 SHA256 59303c677bd89c1502dda6018123427f0514938eff485d4ef82b3a78cea86c4b
+MISC ChangeLog 10304 RMD160 c24f8fe1da26884ec6ffcb3cf53f6da6b54f79ba SHA1 bf46da9e4a215eb99ef3299e2b41644b1b218969 SHA256 8a9b54f3dbbf223f492d94646f40cc517ce2e9eccaa630ac8d01d912b73ab83d
 MISC metadata.xml 1008 RMD160 56bf21dd5495092dacdd23cfd2fc2b6c9a32aed6 SHA1 2471d8dd043020ca3954c8960138f37b2a623180 SHA256 0a95314c82e8543fda8e9e95ad1b8097d183e482d278cfca5f082fa987e2838b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk2M7sIACgkQIiMqcbOVdxT19gP6AinC/n71ktaq0EjYyTOAk+v/
-Osw554/MN6QJ3Ax0+j+AG+txfQmoBTTauthlp0kbaUsT/OZ5gmu8ihHVgy92ecDT
-pG3FiOkoddO9r8iBTTc6vziFICc9G97rIYkVMFihUE1ghlHSf+W4/m7fj6yD4zbD
-R6XHbsv6UVJRujXIlGw=
-=eJkO
+iEYEARECAAYFAk2M8+MACgkQQe4uqXYgU9Wx7gCguIh9npGHYShteJlfrmew2OJJ
+bfYAn2v/0m6+2kxwH47XwGp/bZjxWmtO
+=fOLw
 -----END PGP SIGNATURE-----
diff --git a/sci-electronics/geda/files/geda-gattrib-1.4.0-gtkentry.patch b/sci-electronics/geda/files/geda-gattrib-1.4.0-gtkentry.patch
deleted file mode 100644
index 10d023ef1030..000000000000
--- a/sci-electronics/geda/files/geda-gattrib-1.4.0-gtkentry.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-diff -ur -u geda-gattrib-1.4.3.orig/src/gtkitementry_2_2.c geda-gattrib-1.4.3/src/gtkitementry_2_2.c
---- geda-gattrib-1.4.3.orig/src/gtkitementry_2_2.c	2010-06-08 16:53:06.000000000 +0000
-+++ geda-gattrib-1.4.3/src/gtkitementry_2_2.c	2010-06-08 16:56:16.000000000 +0000
-@@ -811,23 +811,23 @@
-       new_text_length = g_utf8_offset_to_pointer (new_text, n_chars) - new_text;
-     }
- 
--  if (new_text_length + entry->n_bytes + 1 > entry->text_size)
-+  if (new_text_length + entry->x_n_bytes + 1 > entry->x_text_size)
-     {
--      while (new_text_length + entry->n_bytes + 1 > entry->text_size)
-+      while (new_text_length + entry->x_n_bytes + 1 > entry->x_text_size)
- 	{
--	  if (entry->text_size == 0)
--	    entry->text_size = MIN_SIZE;
-+	  if (entry->x_text_size == 0)
-+	    entry->x_text_size = MIN_SIZE;
- 	  else
- 	    {
--	      if (2 * (guint)entry->text_size < MAX_SIZE &&
--		  2 * (guint)entry->text_size > entry->text_size)
--		entry->text_size *= 2;
-+	      if (2 * (guint)entry->x_text_size < MAX_SIZE &&
-+		  2 * (guint)entry->x_text_size > entry->x_text_size)
-+		entry->x_text_size *= 2;
- 	      else
- 		{
--		  entry->text_size = MAX_SIZE;
--		  if (new_text_length > (gint)entry->text_size - (gint)entry->n_bytes - 1)
-+		  entry->x_text_size = MAX_SIZE;
-+		  if (new_text_length > (gint)entry->x_text_size - (gint)entry->x_n_bytes - 1)
- 		    {
--		      new_text_length = (gint)entry->text_size - (gint)entry->n_bytes - 1;
-+		      new_text_length = (gint)entry->x_text_size - (gint)entry->x_n_bytes - 1;
- 		      new_text_length = g_utf8_find_prev_char (new_text, new_text + new_text_length + 1) - new_text;
- 		      n_chars = g_utf8_strlen (new_text, new_text_length);
- 		    }
-@@ -836,19 +836,19 @@
- 	    }
- 	}
- 
--      entry->text = g_realloc (entry->text, entry->text_size);
-+      entry->text = g_realloc (entry->text, entry->x_text_size);
-     }
- 
-   index = g_utf8_offset_to_pointer (entry->text, *position) - entry->text;
- 
--  g_memmove (entry->text + index + new_text_length, entry->text + index, entry->n_bytes - index);
-+  g_memmove (entry->text + index + new_text_length, entry->text + index, entry->x_n_bytes - index);
-   memcpy (entry->text + index, new_text, new_text_length);
- 
--  entry->n_bytes += new_text_length;
-+  entry->x_n_bytes += new_text_length;
-   entry->text_length += n_chars;
- 
-   /* NUL terminate for safety and convenience */
--  entry->text[entry->n_bytes] = '\0';
-+  entry->text[entry->x_n_bytes] = '\0';
-   
-   if (entry->current_pos > *position)
-     entry->current_pos += n_chars;
-@@ -881,9 +881,9 @@
-       gint start_index = g_utf8_offset_to_pointer (entry->text, start_pos) - entry->text;
-       gint end_index = g_utf8_offset_to_pointer (entry->text, end_pos) - entry->text;
- 
--      g_memmove (entry->text + start_index, entry->text + end_index, entry->n_bytes + 1 - end_index);
-+      g_memmove (entry->text + start_index, entry->text + end_index, entry->x_n_bytes + 1 - end_index);
-       entry->text_length -= (end_pos - start_pos);
--      entry->n_bytes -= (end_index - start_index);
-+      entry->x_n_bytes -= (end_index - start_index);
-       
-       if (entry->current_pos > start_pos)
- 	entry->current_pos -= MIN (entry->current_pos, end_pos) - start_pos;
-@@ -1157,7 +1157,7 @@
- {
-   gtk_im_context_set_surrounding (context,
-                                   entry->text,
--                                  entry->n_bytes,
-+                                  entry->x_n_bytes,
-                                   g_utf8_offset_to_pointer (entry->text, entry->current_pos) - entry->text);
- 
-   return TRUE;
-@@ -1364,7 +1364,7 @@
-       
-       if (entry->visible)
-         {
--          g_string_prepend_len (tmp_string, entry->text, entry->n_bytes);
-+          g_string_prepend_len (tmp_string, entry->text, entry->x_n_bytes);
-           g_string_insert (tmp_string, cursor_index, preedit_string);
-         }
-       else
-@@ -1373,7 +1373,7 @@
-           gint preedit_len_chars;
-           gunichar invisible_char;
-           
--          ch_len = g_utf8_strlen (entry->text, entry->n_bytes);
-+          ch_len = g_utf8_strlen (entry->text, entry->x_n_bytes);
-           preedit_len_chars = g_utf8_strlen (preedit_string, -1);
-           ch_len += preedit_len_chars;
- 
-@@ -1407,7 +1407,7 @@
-     {
-       if (entry->visible)
-         {
--          pango_layout_set_text (layout, entry->text, entry->n_bytes);
-+          pango_layout_set_text (layout, entry->text, entry->x_n_bytes);
-         }
-       else
-         {
diff --git a/sci-electronics/geda/geda-1.4.0-r1.ebuild b/sci-electronics/geda/geda-1.4.0-r1.ebuild
deleted file mode 100644
index f1b6890018e4..000000000000
--- a/sci-electronics/geda/geda-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/geda/geda-1.4.0-r1.ebuild,v 1.4 2011/03/02 18:06:07 jlec Exp $
-
-EAPI="1"
-
-inherit eutils versionator
-
-SUBDIR="v$(get_version_component_range 1-2)"
-S="${WORKDIR}"
-
-HOMEPAGE="http://www.geda.seul.org"
-DESCRIPTION="Core metapackage for all the necessary components you would need for a minimal gEDA/gaf system"
-SRC_URI="http://www.geda.seul.org/release/${SUBDIR}/${PV}/geda-gattrib-${PV}.tar.gz
-	http://www.geda.seul.org/release/${SUBDIR}/${PV}/geda-gnetlist-${PV}.tar.gz
-	http://www.geda.seul.org/release/${SUBDIR}/${PV}/geda-gschem-${PV}.tar.gz
-	http://www.geda.seul.org/release/${SUBDIR}/${PV}/geda-gsymcheck-${PV}.tar.gz
-	http://www.geda.seul.org/release/${SUBDIR}/${PV}/geda-symbols-${PV}.tar.gz
-	http://www.geda.seul.org/release/${SUBDIR}/${PV}/geda-utils-${PV}.tar.gz
-	doc? ( http://www.geda.seul.org/release/${SUBDIR}/${PV}/geda-docs-${PV}.tar.gz )
-	examples? ( http://www.geda.seul.org/release/${SUBDIR}/${PV}/geda-examples-${PV}.tar.gz )"
-
-IUSE="doc examples gd threads"
-LICENSE="GPL-2"
-KEYWORDS="ppc"
-SLOT="0"
-
-DEPEND="
-	x11-libs/gtk+:2
-	>=dev-scheme/guile-1.6.3
-	=sci-libs/libgeda-${PV}"
-
-pkg_setup() {
-	if has_version ">=dev-scheme/guile-1.8" ; then
-		built_with_use "dev-scheme/guile" deprecated \
-			|| die "You need either <dev-scheme/guile-1.8, or >=dev-scheme/guile-1.8 with USE=deprecated"
-	fi
-	if use gd ; then
-		built_with_use sci-libs/libgeda gd || die "sci-libs/libgeda must be compiled with USE=gd"
-	else
-		! built_with_use sci-libs/libgeda gd || die "sci-libs/libgeda must be compiled with USE=-gd"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	# Fix security bug #247538 (CVE-2008-5148), thanks to Chitlesh Goorah
-	sed -i \
-		-e 's:TMP=/tmp/\$\$:TMP=$(mktemp):' \
-		-e 's:>/tmp/\$\$:>${TMP}:' \
-		"${S}"/geda-gnetlist-${PV}/scripts/sch2eaglepos.sh \
-		|| die "sed failed"
-	# fix for renamed members of GTKEntry from gtk+-2.17 on (see bug 323127)
-	cd "${S}"/geda-gattrib-${PV}
-	epatch "${FILESDIR}"/geda-gattrib-${PV}-gtkentry.patch
-}
-
-src_compile() {
-	local myconf="--disable-threads"
-	use threads || myconf="--enable-threads=posix"
-	for subdir in geda-{symbols,gschem,gnetlist,gsymcheck,gattrib,utils}-${PV}; do
-		cd "${S}/${subdir}"
-		econf \
-			${myconf} \
-			--disable-dependency-tracking \
-			--with-docdir=/usr/share/doc/${PF} \
-			--with-pcbconfdir=/usr/share/pcb \
-			--with-pcbm4dir=/usr/share/pcb/m4 \
-			--disable-update-desktop-database \
-			--disable-rpath \
-			--with-x \
-			|| die "Configuration failed in ${subdir}"
-		emake || die "Compilation failed in ${subdir}"
-	done
-
-	if use doc ; then
-		cd "${S}/geda-docs-${PV}"
-		econf --with-docdir=/usr/share/doc/${PF} || die "Configuration failed in geda-docs-${PV}"
-		emake || die "Compilation failed in geda-docs-${PV}"
-	fi
-}
-
-src_install () {
-	for subdir in geda-{symbols,gschem,gnetlist,gsymcheck,gattrib,utils}-${PV}; do
-		cd "${S}/${subdir}"
-		emake DESTDIR="${D}" install || die "Installation failed in geda-${subdir}-${PV}"
-		newdoc AUTHORS AUTHORS.${subdir}
-		newdoc BUGS BUGS.${subdir}
-		for READMEx in $(ls README*); do
-			newdoc ${READMEx} ${READMEx}.${subdir}
-		done
-	done
-
-	rm "${D}"/usr/share/gEDA/sym/gnetman -Rf # Fix collision with gnetman; bug #77361.
-
-	if use doc ; then
-		cd "${S}"/geda-docs-${PV}
-		emake DESTDIR="${D}" install || die "Installation failed in geda-docs-${PV}"
-	fi
-
-	if use examples ; then
-		cd "${S}"
-		mv geda-examples-${PV} examples
-		insinto /usr/share/gEDA
-		doins -r examples
-	fi
-}
-
-src_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-src_postrm() {
-	fdo-mime_desktop_database_update
-}