From: Tim Harder Date: Thu, 22 Sep 2011 07:33:53 +0000 (+0000) Subject: Use correct patch. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=68b8c19ae4520e4456beb6a3876e343222d9b042;p=gentoo.git Use correct patch. Package-Manager: portage-2.2.0_alpha58/cvs/Linux x86_64 --- diff --git a/dev-java/rxtx/ChangeLog b/dev-java/rxtx/ChangeLog index b57cee1af48e..642e7e808c3a 100644 --- a/dev-java/rxtx/ChangeLog +++ b/dev-java/rxtx/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/rxtx # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/rxtx/ChangeLog,v 1.17 2011/09/22 07:17:57 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/rxtx/ChangeLog,v 1.18 2011/09/22 07:33:53 radhermit Exp $ + + 22 Sep 2011; Tim Harder + files/rxtx-2.2_pre2-add-ttyACM.patch: + Use correct patch. 22 Sep 2011; Tim Harder rxtx-2.1.7.2-r2.ebuild, rxtx-2.1.7.2-r3.ebuild: diff --git a/dev-java/rxtx/Manifest b/dev-java/rxtx/Manifest index 8cfa97594c6e..af69286ba55e 100644 --- a/dev-java/rxtx/Manifest +++ b/dev-java/rxtx/Manifest @@ -6,22 +6,22 @@ AUX rxtx-2.1-7r2-add-ttyACM.diff 979 RMD160 aadeee8f0a42bcde710dd070ca0938ce165d AUX rxtx-2.1-7r2-lfd-include-limits.diff 286 RMD160 4d86d23e28ddf7042c718bb92acf1d4d1b62e434 SHA1 b2110e3561282a80a60b1d645c6317e39432092e SHA256 b0e9ee9cfd6b061d814aafd3b90dc52500c3db24867c1d740299dd543144d7fe AUX rxtx-2.1-7r2-lfd.diff 497 RMD160 273ec40878a09d7d54ea164a9233bd10a9ac2b85 SHA1 cc4a79cdbe5c5ee858cde517f77676c5587e3ab7 SHA256 83bedeb80858fa7671c102cca3d8f95e59046a081f9da1213efafacd0371322b AUX rxtx-2.1-7r2-nouts.diff 3583 RMD160 355948dfbf04e89f8ee95e3b17dfccb96de5bb4c SHA1 7468ef8e6d9f98b8d5cef48276304ccd8389384b SHA256 bdea39bd623d71ebffd0412476f7b9cd680c7e61ab546bda06dfa517bf175faf -AUX rxtx-2.2_pre2-add-ttyACM.patch 842 RMD160 87be602fdcb54f2ac2402025d72c3475fdfa4c86 SHA1 3af31ab2bed8734d737ff38c3bf5809bd7c39f49 SHA256 db200f71bb936465616b5f181a4127287d7b9083b07a0981078cbef08c985fe9 +AUX rxtx-2.2_pre2-add-ttyACM.patch 328 RMD160 92797b18acff1322fd8a3853a9a174d73531a38e SHA1 275b6772e5bbeb7ef200df5ff833c2050d8ca700 SHA256 81263de05372827743ba3373dc43190494defebee390dd91a24ad4d68aaae699 DIST rxtx-2.1-7r2.zip 1345757 RMD160 dc569a654fbef58aa521013e170c0200b8b3668f SHA1 1d9ef2f80b23bc08b8fdeaa547ee78cb5f76e613 SHA256 31db3852a86105766758975519b27d262407c96cacad4f34ad0de5aae26addd9 DIST rxtx-2.2pre2.zip 1491209 RMD160 b92f1aefd01751d0a8212428c67b1af7515292b2 SHA1 ce793281940cb6acbf1461e8f8752e61040b4f6d SHA256 3c30373e760f444def3650c76c5a00ae12fb1d860ec008750d084f4880495b03 EBUILD rxtx-2.1.7.2-r2.ebuild 2389 RMD160 ee026a817ac07f677018ce8de83ec99cae4400b7 SHA1 f78aa5e4501e4dca7eb45b60a5ce0b88503517ed SHA256 4d39956aac93885a039dcbb531fd1a3e1f901261db29319c9bb1d779a60566ac EBUILD rxtx-2.1.7.2-r3.ebuild 2477 RMD160 3ee49c55d9c8929300eee43fd3df61e69e3326a2 SHA1 4f6a19fc895d30b1e8f98e1ab298f02b88f3a7e9 SHA256 c4decc0aaa4dd9c6000a23f3ede79729c9da51c17df52f2a95d4e90628d1ea47 EBUILD rxtx-2.2_pre2.ebuild 2321 RMD160 72ab5355ffaa286b612ff31777145cfd6b7a7e0d SHA1 55544e15d1a7d26bd43c24971eba38b74782bcfd SHA256 3142ae941efc358ed0bee5c3b92fcd2df94eea6b71f7e55893bbc61947404fda -MISC ChangeLog 2923 RMD160 11a263e525b5bf5071f8c8fde3f9e7549c3120b5 SHA1 ea4cffa854e47e86d492f1818b96a69d3e219c34 SHA256 67fb89f7d2970756450a33ac2a62258c28513e8d4fe49147e9afe7432fb96f26 +MISC ChangeLog 3034 RMD160 2893b395e81b02dcb32a256d799495eca7e53b9d SHA1 107c70c8fbe33ff14e72e31aeff295bf88e16995 SHA256 fbaff966be8ab7420b9c1b9d319bf2abc73f869603d8da6425b543793f48e67c MISC metadata.xml 250 RMD160 df44ee5bc96c577fb7a08006ad728df57813da16 SHA1 3d6e62be3be2ef8e4dd763e1593ed0495a8fd406 SHA256 83a968fdd0034f60b9aa197e06151edd9f9e613527beae042fd7853b9ae4fc9d -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBCgAGBQJOeuEsAAoJEEqz6FtPBkyjERkH/A+tVL56EGgS7YI0r/t3eDYj -g8dz434qPx9nhowTEpDkyCMkxAVbnh1XViijF2ZFzhWsiKfiNnl8ZbIt/3F23Txy -lSHRs/QRpmWeTp+wEPOiUnVyPKXlEC9oS20a6Z7NhQJAXADNjtJ0jUPslPIgB9Oc -itomOeMx0KLaQe5rdvngkW7pjL2iO6fN5Nv0bqyz9hh1BG031ELghroSsLmLg+dl -eSB5m/9Y6DBxYNeRqQ97XbRFQI7CutjpiuAsP0vUUPTko7s1zjibjzyqyib+BhO4 -WcbJtScBXh1BAzMCeLox80VZVmQsra7ZpYa6wSsFUfGBzzHBqW96qAin7WofwQI= -=FD35 +iQEcBAEBCgAGBQJOeuTmAAoJEEqz6FtPBkyjcR8H/iDj2K5UDnnqXjXUQlAtnV4J +5nZk2tQTTp1+NwfEO0VT9gYQFmNkkm3uY7mynCPhHGiImdbyUIhUpA9wLJ+n6wxk +T2/Nq1AXY/wT8Cnp7AzCiZK1Cl6VUJYEWNSH/4nZbtiE36tldgLVcnuboYVDG4Oe +kC2DcJxPPT5Yk05ivJpj5egenln9EC7jbQsfim8wEfIAXbSij5FiF5H80cTGoM8a +BsewOEtKzTiKi2lCAg4Nro6kdxEpvPvqKIFa4+0WwnNg0NkTiz5HcvChnNOO3AJw +facDc2v8U7zkhfqOyhULIJNaGegfHCLQgNTu5MTjzHXflNnNpkCruSKtUv3824g= +=9UNZ -----END PGP SIGNATURE----- diff --git a/dev-java/rxtx/files/rxtx-2.2_pre2-add-ttyACM.patch b/dev-java/rxtx/files/rxtx-2.2_pre2-add-ttyACM.patch index cf1e1d9bfea0..ac3a0a9dbee5 100644 --- a/dev-java/rxtx/files/rxtx-2.2_pre2-add-ttyACM.patch +++ b/dev-java/rxtx/files/rxtx-2.2_pre2-add-ttyACM.patch @@ -1,21 +1,10 @@ ---- rxtx-2.2pre2/CNI/RXTXCommDriver.java.orig 2010-02-12 09:13:00.032700879 -0800 -+++ rxtx-2.2pre2/CNI/RXTXCommDriver.java 2010-02-12 09:13:57.504441037 -0800 -@@ -556,8 +556,10 @@ +--- rxtx-2.2pre2/src/gnu/io/RXTXCommDriver.java.orig ++++ rxtx-2.2pre2/src/gnu/io/RXTXCommDriver.java +@@ -574,6 +574,7 @@ if(osName.equals("Linux")) { String[] Temp = { + "ttyACM", // linux USB modems "ttyS", // linux Serial Ports - "ttySA" // for the IPAQs -+ "ttyUSB", //linux USB serial converters - }; - CandidatePortPrefixes=Temp; - } -@@ -573,6 +575,7 @@ - "ttyircomm", // linux IrCommdevices (IrDA serial emu) - "ttycosa0c", // linux COSA/SRP synchronous serial card - "ttycosa1c", // linux COSA/SRP synchronous serial card -+ "ttyACM", // linux USB modems - "ttyC", // linux cyclades cards - "ttyCH",// linux Chase Research AT/PCI-Fast serial card - "ttyD", // linux Digiboard serial card + "ttySA", // for the IPAQs + "ttyUSB", // for USB frobs