Removed obsolete virtual link cable wrt #363383 by jimtahu

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

4 files changed, 46 insertions, 11 deletions

diff --git a/sci-calculators/tiemu/ChangeLog b/sci-calculators/tiemu/ChangeLog
index a84039775a7f..008ef5354984 100644
--- a/sci-calculators/tiemu/ChangeLog
+++ b/sci-calculators/tiemu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-calculators/tiemu
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/tiemu/ChangeLog,v 1.6 2011/03/02 21:27:01 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/tiemu/ChangeLog,v 1.7 2011/04/13 06:21:23 xarthisius Exp $
+
+  13 Apr 2011; Kacper Kowalik <xarthisius@gentoo.org> tiemu-3.03.ebuild,
+  +files/tiemu-3.03-r2820.patch:
+  Removed obsolete virtual link cable wrt #363383 by jimtahu
 
   02 Mar 2011; Justin Lecher <jlec@gentoo.org> tiemu-3.03.ebuild:
   Correct Slots for gtk 3 introduction to tree
diff --git a/sci-calculators/tiemu/Manifest b/sci-calculators/tiemu/Manifest
index adbb2171d218..f7b154dd8328 100644
--- a/sci-calculators/tiemu/Manifest
+++ b/sci-calculators/tiemu/Manifest
@@ -1,15 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX tiemu-3.03-r2820.patch 793 RMD160 6ef164762f04e112ca2a4f179bc96442b8e4375c SHA1 191d3e0ce46a766ca0150f0812134786040290ae SHA256 daa97e612d0b7addaf4360ef6a419264a289ebd48a21085cb35b973cd480323c
 AUX tiemu-3.03-remove_depreciated_gtk_calls.patch 5180 RMD160 36aff00e850c7ef05357844ffa0868b677f8f33c SHA1 637795391d58f8e1474931000449a9c8502133cf SHA256 8834a2b16c5fef267570354eb3853a45324a448b1d65000789625b578dd49733
 DIST tiemu_3.03.orig.tar.gz 27343892 RMD160 a749681d12367291d6a71e47fbd1e9c662805734 SHA1 c95467a41eef4b4e90a7a59d8400ae72ed0e22b2 SHA256 c47b1c58640622c0fac9049d83eb8953d5805e54dede32cb2d3aa6453fb9ce8b
-EBUILD tiemu-3.03.ebuild 1625 RMD160 b63121cba7469474f2034539895251c653a87247 SHA1 237f2e537fdf26a50ff6f2cce497e8d16029cc09 SHA256 cd5ecf9f86bd7cd73685acbea74764fbebb4dab58ef332966060910091907534
-MISC ChangeLog 1510 RMD160 bbf241815aad24cac216384bf2c7f7a3e1fe13db SHA1 81fdc3d867eddb6add481c3086305399b66f3f2b SHA256 3509ce83995bd20301a180bce60b900f72320dd652624304bcda414645daa2f9
+EBUILD tiemu-3.03.ebuild 1641 RMD160 428c1d1ab57e2d2632b93ad0aadb9a3307b9f782 SHA1 16f4cb9d31a73f299204f9240efc9fd27c9f1f98 SHA256 0c5635a18ccbabe157f0e2811a8009bd417637521e4d65694a8388ace4c3b423
+MISC ChangeLog 1684 RMD160 79244f9743d95b9a6a02d9529e00529fbdd0a19a SHA1 c3cc36b0b9f9cb55ca2371be30eecc6f8708f0f5 SHA256 b4cf6fe430af7db70e731cd63b9cc61d9747158833a11393b13cd3987baa6094
 MISC metadata.xml 498 RMD160 65c016d1c9e8597ad1ff77a34aa992bc175c5ac1 SHA1 4b562110472fafb3d6045c2692dfde7f4a7183a8 SHA256 d7e0ed8a46f9fba60ac8f1d40b011267056bb25fa22b480fd0eaa9a02ec00d7b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk1utjEACgkQgAnW8HDreRbSMgCguHXummCv83HJwR6ud/9iBYDw
-GowAoIqwN7ZmhzDV3YXtyTMVn9hZQ8Gc
-=AvM8
+iJwEAQECAAYFAk2lQOwACgkQIiMqcbOVdxSnzQP+IxmGsdj5pz7Xj8P3Ez0YWCjl
+rHG/QeDCetpJpuJAvh1bymPAl2vcRNif1ij47PsHL0Up+Vvi+8niAjiPszsAD07n
+kfZOMXSzabEA81Ps/VGF0HEq6BNptaOH4MinJX5Mr4tX7s+VqSillc94JYviyYE0
+2ZU9HrYNB9dGvC2DP3U=
+=Nmgw
 -----END PGP SIGNATURE-----
diff --git a/sci-calculators/tiemu/files/tiemu-3.03-r2820.patch b/sci-calculators/tiemu/files/tiemu-3.03-r2820.patch
new file mode 100644
index 000000000000..cf563e8d4c67
--- /dev/null
+++ b/sci-calculators/tiemu/files/tiemu-3.03-r2820.patch
@@ -0,0 +1,28 @@
+Removed obsolete virtual link cable.
+
+http://svn.tilp.info/cgi-bin/viewvc.cgi?view=rev&root=tiemu&revision=2820
+https://bugs.gentoo.org/show_bug.cgi?id=363383
+
+--- src/gui/device.c
++++ src/gui/device.c
+@@ -102,10 +102,6 @@
+ 		gtk_option_menu_set_history(GTK_OPTION_MENU(data), 7);

+ 	break;

+ 	

+-	case CABLE_VTL:

+-		gtk_option_menu_set_history(GTK_OPTION_MENU(data), 8);

+-	break;   

+-

+ 	case CABLE_ILP:

+ 		gtk_option_menu_set_history(GTK_OPTION_MENU(data), 9);

+ 	break;

+@@ -194,8 +190,7 @@
+ 	case 5: tmp.cable_model = CABLE_USB; break;	

+ 	case 6: tmp.cable_model = CABLE_VTI; break;

+ 	case 7: tmp.cable_model = CABLE_TIE; break;

+-	case 8: tmp.cable_model = CABLE_VTL; break;

+-	case 9: tmp.cable_model = CABLE_ILP; break;

++	case 8: tmp.cable_model = CABLE_ILP; break;

+ 	}

+ }

+ 

diff --git a/sci-calculators/tiemu/tiemu-3.03.ebuild b/sci-calculators/tiemu/tiemu-3.03.ebuild
index 27ac206080d8..a65b027df2aa 100644
--- a/sci-calculators/tiemu/tiemu-3.03.ebuild
+++ b/sci-calculators/tiemu/tiemu-3.03.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/tiemu/tiemu-3.03.ebuild,v 1.5 2011/03/02 21:27:01 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/tiemu/tiemu-3.03.ebuild,v 1.6 2011/04/13 06:21:23 xarthisius Exp $
 
 EAPI=2
 inherit eutils
@@ -14,8 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="dbus nls sdl threads xinerama"
 
-RDEPEND="
-	sci-libs/libticables2
+RDEPEND="sci-libs/libticables2
 	sci-libs/libticalcs2
 	sci-libs/libtifiles2
 	sci-libs/libticonv
@@ -32,7 +31,8 @@ DEPEND="${RDEPEND}
 	xinerama? ( x11-proto/xineramaproto )"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-remove_depreciated_gtk_calls.patch
+	epatch "${FILESDIR}"/${P}-remove_depreciated_gtk_calls.patch \
+		"${FILESDIR}"/${P}-r2820.patch
 
 	# Don't use GTK_DISABLE_DEPRECATED flags
 	sed 's:-DGTK_DISABLE_DEPRECATED::g' -i configure.ac configure || die
@@ -53,7 +53,7 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" install || die
 	rm -f "${D}"usr/share/tiemu/{Manpage.txt,COPYING,RELEASE,AUTHORS,LICENSES}
 	dodoc AUTHORS NEWS README README.linux RELEASE TODO
 	make_desktop_entry tiemu "TiEmu Calculator" \