gentoo resync : 07.07.2018

5 files changed, 18 insertions, 16 deletions

diff --git a/sys-apps/flashrom/Manifest b/sys-apps/flashrom/Manifest
index af17edb78a3e..5d30c8473172 100644
--- a/sys-apps/flashrom/Manifest
+++ b/sys-apps/flashrom/Manifest
@@ -6,7 +6,7 @@ DIST flashrom-1.0.tar.bz2 321693 BLAKE2B 7e3e021cdf639083717ca30d5268ac9e02eb8b6
 EBUILD flashrom-0.9.6.1.ebuild 2702 BLAKE2B e09bdc5eefbb5ede081353387f4f28d5de54a1298e867053774a883fdbd5a4cdd3df7dcc461a1806911c0ff74f84ee086130d0c1c9e250e01ff39c725635f62e SHA512 5488a0f73d3545182fd1e240add89304044aa511db26cb1799a4f99112c55902a70a1fdf79f12d1bb5713b18d5f1a4bdf1136b5c18d381cffe7430cf5dc80020
 EBUILD flashrom-0.9.7.ebuild 3394 BLAKE2B f95bbed798bb7a86c962c32cf2b09b47474415fb141d72c13d6045b955153d8a50e0f29834f641bc674f7349796167d0a9be9fae7dad2c9758ec79df14f8f816 SHA512 6435c267b8664b7cdfe9a8fedea13ff4e5756e107ed40643b16c404f6c46bff4c6f679cc02154d29157ff45c2fa3930d9fe742c258bf29de502ed8c090f92ea9
 EBUILD flashrom-0.9.8.ebuild 4129 BLAKE2B 40113bd2aae43ad066b0e3f3da25e2164bb94250047d8cc360402af983f6dd4ad8de5a0c285fccce776c301fd659e5e3dd49d36fa9f550726ea631f7ea7c71a5 SHA512 2fa5038683700dbe446a386f93c37afcb6f089396b4f6e17526de58ca840cb3c908808335988a6d84ebe44868d92d47dfba6bcc7b62a0cfc1ba8568f4258770f
-EBUILD flashrom-0.9.9.ebuild 4247 BLAKE2B 14c4b35866d6f45924b20f625152bad859c853ae651d0704e1ec267f420ca6a29013fc67b6b8cfe6ae42cd86d23d68420e914f4a77c383724055470b387507db SHA512 4a8591b141a7c3964e814e4b47f0cc3f1f4810ef0526b640846668f3a54a7b69354f4ac02e937842042e3e6cefa112e711d6ad22d2742b1711125c451c6968b1
-EBUILD flashrom-1.0.ebuild 4146 BLAKE2B ceeaea4b99c4151866294c5ed4bf25203bc9cd394d79e60f553e02ef76e73863d3196691d47bb0f46fef3c55370358c91d9373751e5bec261f38093721ccc374 SHA512 0dfee6352b5bdf9f349ba257fedc73d5e3ba5071951eb5ff5be73b4e7be9aa4df338c296125dc52e5602dffce49c094f11d4c1a04f7abaee0846ee52e7032c5b
-EBUILD flashrom-9999.ebuild 4157 BLAKE2B 96c421bb2fc4d94c8c8159c9274bb5ac4e9effb604ea1224c7f52b6418f07ddb89348468af99042b648af61b8b6044f3e2c173aa506057c75f8d32bc0e5c8b8e SHA512 87020f0701717ddacc8c6db549718a6c9f7adebc23488a0bbfd56952a5cdf3b156fc5e4929f416b0822aafab51952a7f7441dfe7ef9b3e0b4bee7b476ccff681
-MISC metadata.xml 4561 BLAKE2B c2498b2fbaffd1c1afe85cbca55a04e1d79e96c3a460ca4445d9c3386dc4208dfc342a620b8a896c772540ea39b63b1cb701e1863d9db106f51e5f1b61dec600 SHA512 1907479d6aa1930dc7eaab630e828e6746cf11f99f04b45cdaaf153beafd276dea0104ce07ea538ae7bfee36565c0772fad6a7af135a361e20cbdab9cbd28e5c
+EBUILD flashrom-0.9.9.ebuild 4249 BLAKE2B 4618423e4a0cafc1d94453839ab846f29ebfc904f41bd888ba6ddb0c884b10176c77f914f87c90013ddf15c3a68a6ea56dd739c5e51e9f49182706d5c55008e3 SHA512 dd62222c8c92c53e21e7b03d7d8d82836a3b3d724ecc55cf878708e2b32f7b7ee16b99a083bd3f3556546396e9c11941df4d7e6e92af69176416b32bb39f90a6
+EBUILD flashrom-1.0.ebuild 4148 BLAKE2B 78cb2ae88f8f8e6afbd959fba5a2b2d64e4d62f4db709d287330e499c6a3af2b8003dd8a48177a9f28b5e6183c449bcd06d81a596a4f42739db21b42f2b3681e SHA512 db947a856e8a4ca801d478f168b0a036fc1d33f718f4e1e136e84d773ea65d7e0c060c5d429ad6872ec110cee39fc7216fc40d07df1c778694e319caa791e436
+EBUILD flashrom-9999.ebuild 4225 BLAKE2B e9c5d6792f40fa0580088c442ca0238c35e69ae1cfa1fbc05a749a8137529cb7fd5d721c2f2c7e21d6de593fd06c517971d0fa6d6adae5dff0d59ad0ee2056d7 SHA512 66cf2081ca1fca2ec0d6746c5f003d869cf2455f228b473004834397e44c6280df725f6a57a481c524886219ec5aadbd52a1a91779e33d05a340f6f70f054367
+MISC metadata.xml 4653 BLAKE2B 25d59aa49991e8919240e6653823cddbe5bec073c6962ed5177bc2aae8dde94ad14c3142644b6a20efcacd8e9d65c4617ea9f15d7d8755fb70a9a3486f4c32ff SHA512 5ac8a5dbfee4783698820a053125608843ec6151df756c3d2db2ad559b17803dcc98641e29fdb60d02bd243d9a2ab4d452364b8175dfd001aa8e2400629041e6
diff --git a/sys-apps/flashrom/flashrom-0.9.9.ebuild b/sys-apps/flashrom/flashrom-0.9.9.ebuild
index b6fe28e75232..1ccbc53db826 100644
--- a/sys-apps/flashrom/flashrom-0.9.9.ebuild
+++ b/sys-apps/flashrom/flashrom-0.9.9.ebuild
@@ -21,7 +21,7 @@ SLOT="0"
 # Note: Do not list bitbang_spi as it is not a programmer; it's a backend used
 # by some other spi programmers.
 IUSE_PROGRAMMERS="
-atahpt +atapromise +atavia +buspirate_spi ch341a_spi dediprog +drkaiser +dummy
+atahpt +atapromise +atavia +buspirate_spi +ch341a_spi +dediprog +drkaiser +dummy
 +ft2232_spi +gfxnvidia +internal +it8212 +linux_spi mstarddc_spi +nic3com
 +nicintel +nicintel_eeprom +nicintel_spi nicnatsemi +nicrealtek +ogp_spi
 +pickit2_spi +pony_spi +rayer_spi +satamv +satasii +serprog +usbblaster_spi"
@@ -30,8 +30,8 @@ IUSE="${IUSE_PROGRAMMERS} +internal_dmi static tools +wiki"
 LIB_DEPEND="atahpt? ( sys-apps/pciutils[static-libs(+)] )
 	atapromise? ( sys-apps/pciutils[static-libs(+)] )
 	atavia? ( sys-apps/pciutils[static-libs(+)] )
-	ch341a_spi? ( virtual/libusb:0[static-libs(+)] )
-	dediprog? ( virtual/libusb:0[static-libs(+)] )
+	ch341a_spi? ( virtual/libusb:1[static-libs(+)] )
+	dediprog? ( virtual/libusb:1[static-libs(+)] )
 	drkaiser? ( sys-apps/pciutils[static-libs(+)] )
 	ft2232_spi? ( dev-embedded/libftdi:=[static-libs(+)] )
 	gfxnvidia? ( sys-apps/pciutils[static-libs(+)] )
diff --git a/sys-apps/flashrom/flashrom-1.0.ebuild b/sys-apps/flashrom/flashrom-1.0.ebuild
index 45893e146faf..0c908ab17779 100644
--- a/sys-apps/flashrom/flashrom-1.0.ebuild
+++ b/sys-apps/flashrom/flashrom-1.0.ebuild
@@ -21,7 +21,7 @@ SLOT="0"
 # Note: Do not list bitbang_spi as it is not a programmer; it's a backend used
 # by some other spi programmers.
 IUSE_PROGRAMMERS="
-atahpt +atapromise +atavia +buspirate_spi ch341a_spi dediprog +drkaiser +dummy
+atahpt +atapromise +atavia +buspirate_spi +ch341a_spi +dediprog +drkaiser +dummy
 +ft2232_spi +gfxnvidia +internal +it8212 +linux_spi mstarddc_spi +nic3com
 +nicintel +nicintel_eeprom +nicintel_spi nicnatsemi +nicrealtek +ogp_spi
 +pickit2_spi +pony_spi +rayer_spi +satamv +satasii +serprog +usbblaster_spi"
@@ -30,8 +30,8 @@ IUSE="${IUSE_PROGRAMMERS} +internal_dmi static tools +wiki"
 LIB_DEPEND="atahpt? ( sys-apps/pciutils[static-libs(+)] )
 	atapromise? ( sys-apps/pciutils[static-libs(+)] )
 	atavia? ( sys-apps/pciutils[static-libs(+)] )
-	ch341a_spi? ( virtual/libusb:0[static-libs(+)] )
-	dediprog? ( virtual/libusb:0[static-libs(+)] )
+	ch341a_spi? ( virtual/libusb:1[static-libs(+)] )
+	dediprog? ( virtual/libusb:1[static-libs(+)] )
 	drkaiser? ( sys-apps/pciutils[static-libs(+)] )
 	ft2232_spi? ( dev-embedded/libftdi:=[static-libs(+)] )
 	gfxnvidia? ( sys-apps/pciutils[static-libs(+)] )
diff --git a/sys-apps/flashrom/flashrom-9999.ebuild b/sys-apps/flashrom/flashrom-9999.ebuild
index 0c9d952b2f7f..a89653a104b2 100644
--- a/sys-apps/flashrom/flashrom-9999.ebuild
+++ b/sys-apps/flashrom/flashrom-9999.ebuild
@@ -21,18 +21,19 @@ SLOT="0"
 # Note: Do not list bitbang_spi as it is not a programmer; it's a backend used
 # by some other spi programmers.
 IUSE_PROGRAMMERS="
-atahpt +atapromise +atavia +buspirate_spi ch341a_spi dediprog +drkaiser +dummy
-+ft2232_spi +gfxnvidia +internal +it8212 +linux_mtd +linux_spi mstarddc_spi
-+nic3com +nicintel +nicintel_eeprom +nicintel_spi nicnatsemi +nicrealtek
-+ogp_spi +pickit2_spi +pony_spi +rayer_spi +satamv +satasii +serprog
+atahpt +atapromise +atavia +buspirate_spi +ch341a_spi +dediprog +digilent_spi
++drkaiser +dummy +ft2232_spi +gfxnvidia +internal +it8212 +linux_mtd +linux_spi
+mstarddc_spi +nic3com +nicintel +nicintel_eeprom +nicintel_spi nicnatsemi
++nicrealtek +ogp_spi +pickit2_spi +pony_spi +rayer_spi +satamv +satasii +serprog
 +usbblaster_spi"
 IUSE="${IUSE_PROGRAMMERS} +internal_dmi static tools +wiki"
 
 LIB_DEPEND="atahpt? ( sys-apps/pciutils[static-libs(+)] )
 	atapromise? ( sys-apps/pciutils[static-libs(+)] )
 	atavia? ( sys-apps/pciutils[static-libs(+)] )
-	ch341a_spi? ( virtual/libusb:0[static-libs(+)] )
-	dediprog? ( virtual/libusb:0[static-libs(+)] )
+	ch341a_spi? ( virtual/libusb:1[static-libs(+)] )
+	dediprog? ( virtual/libusb:1[static-libs(+)] )
+	digilent_spi? ( virtual/libusb:1[static-libs(+)] )
 	drkaiser? ( sys-apps/pciutils[static-libs(+)] )
 	ft2232_spi? ( dev-embedded/libftdi:=[static-libs(+)] )
 	gfxnvidia? ( sys-apps/pciutils[static-libs(+)] )
diff --git a/sys-apps/flashrom/metadata.xml b/sys-apps/flashrom/metadata.xml
index ddb50695a2b7..d2729fb7eb66 100644
--- a/sys-apps/flashrom/metadata.xml
+++ b/sys-apps/flashrom/metadata.xml
@@ -21,6 +21,7 @@
 		<flag name="buspirate_spi">Enable Bus Pirate SPI programmer</flag>
 		<flag name="ch341a_spi">Enable WCH CH341A SPI programmer</flag>
 		<flag name="dediprog">Dediprog SF100 support</flag>
+		<flag name="digilent_spi">Enable support for Digilent iCEblink40 development board</flag>
 		<flag name="drkaiser">Enable Dr. Kaiser programmer</flag>
 		<flag name="dummy">Enable dummy tracing</flag>
 		<flag name="ft2232_spi">Enable ftdi programmer, flashing through FTDI/SPI USB interface</flag>