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

(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

5 files changed, 51 insertions, 6 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/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
 }