Fix by Egor Y. Egorov for building with newer libftdi versions #390805 by Paweł Hajdan, Jr.

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

6 files changed, 69 insertions, 16 deletions

diff --git a/dev-embedded/ftdi_eeprom/ChangeLog b/dev-embedded/ftdi_eeprom/ChangeLog
index cc25b8ff0286..6f9077d146de 100644
--- a/dev-embedded/ftdi_eeprom/ChangeLog
+++ b/dev-embedded/ftdi_eeprom/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-embedded/ftdi_eeprom
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/ftdi_eeprom/ChangeLog,v 1.8 2012/05/25 08:10:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/ftdi_eeprom/ChangeLog,v 1.9 2012/06/17 23:46:33 vapier Exp $
+
+  17 Jun 2012; Mike Frysinger <vapier@gentoo.org>
+  +files/ftdi_eeprom-0.2-chip-type.patch,
+  +files/ftdi_eeprom-0.3-chip-type.patch, ftdi_eeprom-0.2.ebuild,
+  ftdi_eeprom-0.3-r1.ebuild:
+  Fix by Egor Y. Egorov for building with newer libftdi versions #390805 by
+  Paweł Hajdan, Jr.
 
   25 May 2012; Samuli Suominen <ssuominen@gentoo.org> -ftdi_eeprom-0.2-r1.ebuild,
   -ftdi_eeprom-0.3.ebuild:
@@ -37,4 +44,3 @@
   +ftdi_eeprom-0.2.ebuild:
   Initial import as per bug #77635. Thanks to Laurence Withers
   <lwithers@users.sf.net>
-
diff --git a/dev-embedded/ftdi_eeprom/Manifest b/dev-embedded/ftdi_eeprom/Manifest
index c78413e9d453..09eb3a168e27 100644
--- a/dev-embedded/ftdi_eeprom/Manifest
+++ b/dev-embedded/ftdi_eeprom/Manifest
@@ -1,21 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX ftdi_eeprom-0.2-chip-type.patch 558 RMD160 4ab924b0740812215faa9f562c2b5fa213c07ada SHA1 3abc68b274bfa2c567ddc83b8da9561e60d61101 SHA256 376b736b4eab1d79bca7ebb5069ddbeaf1c0af907b7a61ff2f8cadd5e28835b7
+AUX ftdi_eeprom-0.3-chip-type.patch 542 RMD160 4dfbdf27a714c0a2df95f6aef7c53c2656895c41 SHA1 36964dbf513ec80ade3a54651fab994db6fc2988 SHA256 aa09b7b647e720a1cc0ee83e7c172e20daf353c413d320a0741cd454b514fd6c
 AUX ftdi_eeprom-0.3-newer-chips.patch 726 RMD160 7dd21449076f870007e21948a0d0b003c5736354 SHA1 ea85e720c1eb0c85c251b1f86f9c55751c76be29 SHA256 428c88044740effe1a2efb5ea408cf0983e96b6b0422947ef175db9078ac6820
 DIST ftdi_eeprom-0.2.tar.gz 571464 RMD160 1a06ede3638c2943b1b487d38196fff9f678d5b6 SHA1 b7f76804784d94b3f1d42f2ff37eb8e2f40baeff SHA256 b3e0409d69783ecfa90c893c817bb584296b4c45d9f17b0f2fdd7c07ef411a3f
 DIST ftdi_eeprom-0.3.tar.gz 103723 RMD160 035a30feb81e269a66f41acefa9b39fc850d8dd2 SHA1 6d9b99cd60bd0bd64f5ebba03bda16a3d16d13a0 SHA256 7b40ec5abb2c93362b9636974e4e4715cb588121c1e1da09d7f499ac7f12d056
-EBUILD ftdi_eeprom-0.2.ebuild 637 RMD160 5728ab2789581770f356ed8af7578a541e0f2fd0 SHA1 2df93d0e70516394c200a075a12f03c39b7ae960 SHA256 74d2d147e2911f7d9f669910a87b91b30d06578bfc134f4f5863a2c577ecad09
-EBUILD ftdi_eeprom-0.3-r1.ebuild 760 RMD160 9848c1ec4f153d812a650f486370ef2adb98a838 SHA1 0578fbad939f3e32f609aa73a7516e8fa12e15db SHA256 cae5fd3c189c26f3a06bd8967dcfc837f34135026aa4a891b891d72cca42ec01
-MISC ChangeLog 1424 RMD160 237fe89c012e385dfa7ce258ed2d9dad7b231e06 SHA1 d799a581410b79c499651fb80dd6c3b38b0128f3 SHA256 83db635b097dc9d46452febdd26cc966e265a669470cb427d7bb9726f02a4e24
+EBUILD ftdi_eeprom-0.2.ebuild 748 RMD160 a085980a2554b0640104995d78e2024ebb5603f0 SHA1 96cced4cb8ea5690c71930ab5bbfc3898606ae3b SHA256 a85b4be35f7b04b7213dcb6f2cf9977d919bd7ff0a28d217dbe42a841e2518c3
+EBUILD ftdi_eeprom-0.3-r1.ebuild 767 RMD160 da6cd90463e86ac5f52f9589da03c9ad4533fc58 SHA1 c023e4a64939adc8626709fce28f75a7596e7d67 SHA256 4904a86996c62327f7c15b93d3ac1bcb6bb1bcc80140dbff4c6ec5c15fa1bd34
+MISC ChangeLog 1705 RMD160 c6f87b33e30475f8b738e20b43462a162c716db1 SHA1 a02c8c39b286ce56cc6ddc931ea09420b4686768 SHA256 d9f4b65eaeb08db3fa3cb8a1759bf6f557d530480197265f025925b1c630aff3
 MISC metadata.xml 275 RMD160 177241993faa62ef38a66f95467b4797dd4f8f4f SHA1 841d996f1620ac2a180c7e396c952de646d0e323 SHA256 776932125fa5904b7904dac867342c0b6133168555fd041e691f0e2598849697
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPvz5nAAoJEEdUh39IaPFNhjUIAITQpP2rQJ6mPbbONjk/u3xG
-r+tVKFNUYC12rUkI/8c9vwqAe26MiYNeCqBKPe4qeksRx9ZLr6T/8znJipvhL2fE
-gZyj21VaeKSm8wN+g7dkpebuT1vKog4O7ca4iu0/XvKX/tx1Qq1YkfdbVZ+idHSz
-HaKLp0Jog0p9A/78zZAeSSXJtse8ZXJ7eRCEyZEXlIe9yZzci8n42hbHfAIjGTk/
-3oqrviU75AypcmSwuGjjFtQj9zOyyJZCfhrzJZAlYH06jkGBanFKt+taSk3KKz1p
-w0ibJLXDqfvTkVySimMTWH1E0KWx1oSmgRI35FEl7XYznyf5AHh8a/CDUlMzUIc=
-=olQH
+iQIcBAEBAgAGBQJP3mxhAAoJELEHsLL7fEFWICQQAL72DPWjUBbHojnAPZC3+LK5
+NEitMEZHNe+jI8sVDPp9S2fssNKGaun9hVrgP4Mw4ChCBl7IXpGKdNEqAOyoh16K
+BGBLG1V/YieTGMtBgJWoxAO1gYdaiHjVrBJblLcx4JF2NW+pSCM4x+8ldpqbLMAp
+HcSSRolfcnJZzaSLbVkN87rsxQ4qvJQ0y4itc5AujNlNGfN4CLmua/AEgK/do/MF
+0Wza+jmOvtSQNujxwI9i+2sQfUXJYqlMGCIJQucJvQ3cZ/aRufQTf44bBOVnG/bM
+rUoGQsRq4pMJA9X0GSfgqRx+AeKMZK7dMl8IUMfOiTekuPrrgRCX6Ax0w5u27O3r
+8YF7K0gWKMm5uwHbak9zdLI43dOvCw5jjyWfMxh2qvDDwarEjDN8GFK6ALrzO+OZ
+Jh4TUAjjKcNacbO0+5oLPMUUA/aUn0o9OclCPM2aUDNPAPmmIiBEav3ULG7T4WCT
+GJLW2qSSFFccXxe4HKgZPBatuFhYkS/Pw+kwHslK+L901I5BkJ/VdN0iJ/pNXFRq
+sPRX2bsSQ8uGlLvuw2f1AGUJwQiwxIHDoMLrkGZSlxb49muK1tOlaJayg8l3sdpt
+ZLRCY2cXRWr+uq9R3VXP6H5N6K8on/pih7kasyL/YUEvn8d2H0pxQHJAmXTtJ82X
+L9I6I62YqJd4gXbRmkVi
+=4ReF
 -----END PGP SIGNATURE-----
diff --git a/dev-embedded/ftdi_eeprom/files/ftdi_eeprom-0.2-chip-type.patch b/dev-embedded/ftdi_eeprom/files/ftdi_eeprom-0.2-chip-type.patch
new file mode 100644
index 000000000000..4b8aa8543960
--- /dev/null
+++ b/dev-embedded/ftdi_eeprom/files/ftdi_eeprom-0.2-chip-type.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/390805
+
+fix by Egor Y. Egorov for building with newer libftdi versions
+
+--- a/ftdi_eeprom/main.c
++++ b/ftdi_eeprom/main.c
+@@ -106,7 +106,7 @@ int main(int argc, char *argv[]) {
+ 
+     eeprom.vendor_id = cfg_getint(cfg, "vendor_id");
+     eeprom.product_id = cfg_getint(cfg, "product_id");
+-    eeprom.BM_type_chip = cfg_getbool(cfg, "BM_type_chip");
++    eeprom.chip_type = cfg_getbool(cfg, "BM_type_chip");
+ 
+     eeprom.self_powered = cfg_getbool(cfg, "self_powered");
+     eeprom.remote_wakeup = cfg_getbool(cfg, "remote_wakeup");
diff --git a/dev-embedded/ftdi_eeprom/files/ftdi_eeprom-0.3-chip-type.patch b/dev-embedded/ftdi_eeprom/files/ftdi_eeprom-0.3-chip-type.patch
new file mode 100644
index 000000000000..1492194045ab
--- /dev/null
+++ b/dev-embedded/ftdi_eeprom/files/ftdi_eeprom-0.3-chip-type.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/390805
+
+fix by Egor Y. Egorov for building with newer libftdi versions
+
+--- a/src/main.c
++++ b/src/main.c
+@@ -106,7 +106,7 @@ int main(int argc, char *argv[]) {
+ 
+     eeprom.vendor_id = cfg_getint(cfg, "vendor_id");
+     eeprom.product_id = cfg_getint(cfg, "product_id");
+-    eeprom.BM_type_chip = cfg_getbool(cfg, "BM_type_chip");
++    eeprom.chip_type = cfg_getbool(cfg, "BM_type_chip");
+ 
+     eeprom.self_powered = cfg_getbool(cfg, "self_powered");
+     eeprom.remote_wakeup = cfg_getbool(cfg, "remote_wakeup");
diff --git a/dev-embedded/ftdi_eeprom/ftdi_eeprom-0.2.ebuild b/dev-embedded/ftdi_eeprom/ftdi_eeprom-0.2.ebuild
index 952da6b28f85..218210cbe9cb 100644
--- a/dev-embedded/ftdi_eeprom/ftdi_eeprom-0.2.ebuild
+++ b/dev-embedded/ftdi_eeprom/ftdi_eeprom-0.2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/ftdi_eeprom/ftdi_eeprom-0.2.ebuild,v 1.4 2012/05/25 08:10:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/ftdi_eeprom/ftdi_eeprom-0.2.ebuild,v 1.5 2012/06/17 23:46:33 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="Utility to program external EEPROM for FTDI USB chips"
 HOMEPAGE="http://www.intra2net.com/opensource/ftdi/"
@@ -15,6 +17,12 @@ RDEPEND="dev-embedded/libftdi
 	dev-libs/confuse"
 DEPEND="${RDEPEND}"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-0.2-chip-type.patch #390805
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die
 	dodoc AUTHORS ftdi_eeprom/example.conf
diff --git a/dev-embedded/ftdi_eeprom/ftdi_eeprom-0.3-r1.ebuild b/dev-embedded/ftdi_eeprom/ftdi_eeprom-0.3-r1.ebuild
index 7f629b6bf621..29f20be4f9b9 100644
--- a/dev-embedded/ftdi_eeprom/ftdi_eeprom-0.3-r1.ebuild
+++ b/dev-embedded/ftdi_eeprom/ftdi_eeprom-0.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/ftdi_eeprom/ftdi_eeprom-0.3-r1.ebuild,v 1.2 2012/05/25 08:10:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/ftdi_eeprom/ftdi_eeprom-0.3-r1.ebuild,v 1.3 2012/06/17 23:46:33 vapier Exp $
 
 EAPI=4
 inherit eutils
@@ -20,9 +20,10 @@ DEPEND="${RDEPEND}"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-newer-chips.patch #376117
+	epatch "${FILESDIR}"/${PN}-0.2-chip-type.patch #390805
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog README src/example.conf
+	default
+	dodoc src/example.conf
 }