summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2013-03-01 08:17:01 +0000
committerMike Frysinger <vapier@gentoo.org>2013-03-01 08:17:01 +0000
commit7846f1cbdf3eb5121ca89e7d1317b22bbefcbef3 (patch)
treea17a52906094669f918f679f5a9f152ba64dc51f /dev-embedded
parentsci-biology/bamtools: Update script and correct dep on jsoncpp (diff)
downloadhistorical-7846f1cbdf3eb5121ca89e7d1317b22bbefcbef3.tar.gz
historical-7846f1cbdf3eb5121ca89e7d1317b22bbefcbef3.tar.bz2
historical-7846f1cbdf3eb5121ca89e7d1317b22bbefcbef3.zip
Version bump.
Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64 Manifest-Sign-Key: 0xFB7C4156
Diffstat (limited to 'dev-embedded')
-rw-r--r--dev-embedded/libftdi/ChangeLog11
-rw-r--r--dev-embedded/libftdi/Manifest36
-rw-r--r--dev-embedded/libftdi/files/libftdi-1.0-staticlibs.patch123
-rw-r--r--dev-embedded/libftdi/libftdi-1.0.ebuild (renamed from dev-embedded/libftdi/libftdi-9999.1.0.ebuild)30
-rw-r--r--dev-embedded/libftdi/libftdi-9999.ebuild28
-rw-r--r--dev-embedded/libftdi/metadata.xml3
6 files changed, 193 insertions, 38 deletions
diff --git a/dev-embedded/libftdi/ChangeLog b/dev-embedded/libftdi/ChangeLog
index a9768b032a53..aea6b3fb8185 100644
--- a/dev-embedded/libftdi/ChangeLog
+++ b/dev-embedded/libftdi/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for dev-embedded/libftdi
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/libftdi/ChangeLog,v 1.62 2012/09/11 06:36:29 vapier Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/libftdi/ChangeLog,v 1.63 2013/03/01 08:16:55 vapier Exp $
+
+*libftdi-1.0 (01 Mar 2013)
+
+ 01 Mar 2013; Mike Frysinger <vapier@gentoo.org>
+ +files/libftdi-1.0-staticlibs.patch, +libftdi-1.0.ebuild,
+ -libftdi-9999.1.0.ebuild, libftdi-9999.ebuild, metadata.xml:
+ Version bump.
11 Sep 2012; Mike Frysinger <vapier@gentoo.org> libftdi-0.20.ebuild:
Do not clobber LIB_SUFFIX setting common code setup.
diff --git a/dev-embedded/libftdi/Manifest b/dev-embedded/libftdi/Manifest
index c0be915bf831..1bb12fa06888 100644
--- a/dev-embedded/libftdi/Manifest
+++ b/dev-embedded/libftdi/Manifest
@@ -1,32 +1,34 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
+AUX libftdi-1.0-staticlibs.patch 4628 SHA256 07bcfe2ec33fa35b3ba248f73842959c61cfb30db86d24aa1ce02eb9949c2e8c SHA512 e8e69c313a0fa0c015b0f9e2be24a9f563f962d1c07c842beb06d7c05b637e64dbd89d9cb7a24f43a328e52d84b6da9252c9df05ad8e1f8ff8694d142271607f WHIRLPOOL e1dee65e1ccea56b7bf1062031ff9c75207118e39846ec8892038c1256677bd1921a92d497ed54395db6b48606334f51cbb65cdcc4307604c39e0bc2f8c27e5d
DIST libftdi-0.17.tar.gz 435901 SHA256 d5c0275125ab68a431375083c9544899e578b8f98b83de1254386d0209feabf0 SHA512 7a8a5d373a92ea6c814155700f12b55affa94755f8b5a72563c6abdcf0d9c2bd8607154b1198a924ed9308576fa419bb00f2c9d7f7d01b85321291fc17360513 WHIRLPOOL 2326af034e1121ad16671246bd602bb5234af831cb4d0a3c5f88e22d780b8d499b3588bd4bfb738db4589fd2d97434ba572f147c489c75bfd35e79c2c8731b03
DIST libftdi-0.18.tar.gz 398380 SHA256 5b6f3c3ee51c6aa24d3b87135e01762cf68821d1c3599d87d349fea4ede74c62 SHA512 1e596097eef4d5cc559fc8c550d53cc2eef70185429aac27ee057c1a447486f8fccb9d84ddb11b76a57908ecdc766b2c92338d8b14f62fe11bc667ec35e1decc WHIRLPOOL e3d2b96fa3c1a303ec7f36b2ead88de6e381567639121f1b19b25a371cbbce808ca3982833522293c517d2b9717616320e72d6369e09955940054b7e8d8ca4a9
DIST libftdi-0.19.tar.gz 406671 SHA256 567c9d2c42d92fc401c5aba2deed45ffb2433990984e816bcdf31e441aef06be SHA512 c6deefe8c83063343321e8c2c6b6c1c2842a9f1caf4e54f47106c3c4aac638736f19fecf91582c6cc9f4917c4d140157440c360ce3a030dfb7fa027483bab972 WHIRLPOOL b3ee2812697cb8e0e549d580b07b2d67f2bc7bbb5da823e80172748d2d907e67c36314c4524beb2278e131a57c1ae4e25efaaa7b243ab80b30a3f88fa9f6fd7a
DIST libftdi-0.20.tar.gz 423570 SHA256 3176d5b5986438f33f5208e690a8bfe90941be501cc0a72118ce3d338d4b838e SHA512 540e5eb201a65936c3dbabff70c251deba1615874b11ff27c5ca16c39d71c150cf61758a68b541135a444fe32ab403b0fba0daf55c587647aaf9b3f400f1dee7 WHIRLPOOL b1eab592bd6a21a123c7e951d5e4cdafc740c20773b8c5c7c86eef2a05bc8a190a2758a04187d3436de464a49dc329d4e4c9e54792287cc5c39a0ec7d08425d2
+DIST libftdi1-1.0.tar.bz2 97072 SHA256 7290fd38208d8c00d25ed13ce172aaa0403b37148080e4a33a99837022d2b321 SHA512 e733db0bf826415971c64723fe1e56cb1201fa1b9e3a3f04a2a47e1d16c543ae29c634a514f5ff5ca422c2e3b3e1715988c84df1dc66114700209dfb1e6d96ae WHIRLPOOL 82b384b396b12681d88531082e6a5d9d765934877192001106b7bb2ee91da91d0941eb7514b7b091fca403d47b4458a5ae06c5249b0cb0114a0fbe7b7056b7ed
EBUILD libftdi-0.17.ebuild 1294 SHA256 6153e07439128c3bcf3933eedb8e29877658d0ef3d233eed6a83d31113b35646 SHA512 eb11f176753acdc9cf05fb7b7ec9254c22eba77c6ace34245d855857d36eed798e0d4575b1dab6f81c49491f875c5701f1ba3044ca74268365a9c46a6606bb33 WHIRLPOOL f11e3dee11338dd6a3a2ca203872ebb105eb4fcf36ea72f63a482f449ba53326a20d5ae8b1f98ba25cb1f4bff6a1885854cb9b07af7a61c125e5dc1dc66e5f5f
EBUILD libftdi-0.18.ebuild 1218 SHA256 2a7269828374fc165f0b9ff285db30081223c1123394f03ab215cddfda8739ad SHA512 6c58aec3ec1a984d729b3f9696527c87bc37a6418bc511adc0f589cb10cf43405d5d1ce55242e802f88dc9e0f02892c6f6ba41568af4c4aeae9bd1b6d0883b77 WHIRLPOOL 2fcfc60f515ec3a3f4389aee092a75b34b7f35aea2c6654d22195281df9fdd0bcb9f0000d118720c2777d29284061abb63bb15b4854e745de28ca71812e48b06
EBUILD libftdi-0.19.ebuild 1322 SHA256 ef3636c64f9fe692e676096393721b010a0874172881f5792ae9b2f80d371052 SHA512 c653271be025ba0c273d684c5523b1c6be2ff7b137068b4dd6f535549f9e9e37f69d2d2e5756f46c8f7b8bc8ba7d59a77d7452df33550e17e1449dc520ff86da WHIRLPOOL 9930f6aaf3217f04266cabcf88d2207090e3aeca8eed926e99d033c0613dcb6b88096c351ddfbe9058b5de3c52485de2455cc13cdb940eabe1fd5170da54f32f
EBUILD libftdi-0.20.ebuild 1458 SHA256 faa3dd4abecfc44227e4b3e2dab3adfbb29b671c999c09551e24e6f31a8ba285 SHA512 a305bd3f520802000bc6663fc5dd1b672dbfbc3d0ba27af9dd48d41b4b80783386be247b302da60187d8c480a0918958a038826732fce80a103d7dedcf36c549 WHIRLPOOL 701039d77fea186c2ea4f1e0ba4f5ac8e906bf33efcb83914e312adf862471c995c2a0fc2dd1097e91bc45de4190331838ccda593cdaf2a9ab4892c7232e0c50
-EBUILD libftdi-9999.1.0.ebuild 1268 SHA256 976e4af42ae57524bd218ebb9a72f179afed2fb275f67895de60785606e65177 SHA512 c06b7afecdd072eb53322c984cd6c468cc8dd361488156b96ba68d6992d4082466ff6660e189fc75595342c7f27477fa13f0b61a9732e3a96d05c712da4c9c35 WHIRLPOOL 19656b9d758d1752519a2c9faea2ee36856f723b628942423299af653c3408d1e07f4203aec8ce382c3e3e12c34da15544f95172a06e01745459367ab395fa6c
-EBUILD libftdi-9999.ebuild 1252 SHA256 2bc60bcebbae8859bf322094518bee1a2296c03d0a0ba0f74a0cfff7fedd1278 SHA512 38e1a41684302ed74edcad7b1bcbee7bb5a67faab185d064ea815ee9aa895873a4cd45e6cb435de594a84b291312cbb39ebf7a6f51b4dde8b28c247a4665fbd0 WHIRLPOOL 84fc25ecb69402b4bfa10bf1fce69921ee0619cf9259ee98a260b7df38191e5f0a21c16d6cc30c00d0bb1fd1db2c8f7a505e97cfd4d24296745deb2c654906c4
-MISC ChangeLog 7146 SHA256 7f2b395a729861d4f9d963ce9ae2d047b5ed4859eca33b09dabf77102bd4f8a3 SHA512 e947a1455ae23378cf8d30a93a376b32cb80cb8a02a3ac2f1bb905159106ea2d959c392e4068a855596b3595ba6e3aa19fd99f30f85218ad94d1593854ef0c46 WHIRLPOOL 43ef566878e27c2f55e4e3adddecb08c4ce6d4c1dbb732513004bc129709ee56eb74f9b759370024da30d10664bc0abcd5a1ecd8f5eca1b53e7feb2202cf092b
-MISC metadata.xml 165 SHA256 fb7ede94a0633f77d601e3e81580eac1624a3bca14401a49d94082579507ba0a SHA512 2be6b57c8e55824d56afbe9ab641639e6e1b4cf73bf2795c2778e373777ad545b5211e06510f13703583e7bb18817f623bc00dddbc8c52ad5f100f085e5dfddf WHIRLPOOL 7fe27fc76b523efadbe65a61c187e78592bc1563423791709914a6263c587a8843c75e19c64f989c7fc8a105c6433a874116ec670df3a27b930634d7e14fb1fe
+EBUILD libftdi-1.0.ebuild 1494 SHA256 ef0e6baed8f44fa40a0872796c641c9a7e4e54c58abcbb0a618aec44e5c5534b SHA512 d5ec6502d5a2b2e10f607b4abda74fe61c382320028723e1db9a3e241444de1cc26d87d96c57a70c625d0c39bc41234e15947ec1d758cb3b9ba92e4f7bd67b89 WHIRLPOOL 3178a8471c2ecc3f4f740705eaed0ac33c2b9692a9efb49bf7e1276553506a7eff4a55bf53de279ac85000b4adc0097da6ed8d9c1165d963870c97a18ba4b4d5
+EBUILD libftdi-9999.ebuild 1495 SHA256 327a1a4f317e13da0f6bd70dfcf5c51838773cf66ab3e44782a4e182482a6ad6 SHA512 bf8bc8017cb47e240a6c5f89243e1784f075f5067fd0ebc2da437bd7da1557879460ab7067dae12a00dec51b484371587f25b84d5027998ccc6611721659c49c WHIRLPOOL bbe0804488d5c81c23941d76372cfd652046ebf625f65e8717b16bf535083b97b7d094442bc2bf12062f487a62aa0a2fac33ca5a11cc6c5ea56502075fbc2295
+MISC ChangeLog 7364 SHA256 f11e3c381f0ce47cc031b4e4d7ed9cbb4ad7d62bf8ac58e3d44ff10ab16e2206 SHA512 0d3a2fe7ffdad479ade111b2f4cacc50749599ca7169ae3ee9c965dbde5dfd2e6720550f16da9069d0120a20ee8b0656a2c99b9b2412829fbcdce272f179af16 WHIRLPOOL 2af946308b012a55fe96e96638b36ec17a08ee3e109e423d938d7d2c18f03db8bec058584caa1e3ba7dd14878918cdc806306718c352f12ee070f7251e7149d7
+MISC metadata.xml 235 SHA256 586ff35feff5b101f251813344f1b28cee4acaf8cdd5364d64160e7dac6eac14 SHA512 f5670bfd4d3039cd527b989fa5235b790c901af56277a84c3f3ae1472e7f28644895ad36f4d70124081365c7129658dcfc4ad637be4f85121d7d1bde34c883ea WHIRLPOOL d9eaff2bafca2108ed9ddaa2abb8458b7a01c3b0d693d47b3dd5c3ecde2fbd35138aee67c6d536a51e720cca5cd4b77693e552a4a126fab1b173942dbf4f8453
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQIcBAEBCAAGBQJQTtx5AAoJELEHsLL7fEFWXckQAJuh6XAdqAKZqkPvU0ZOQXHj
-Yiqt/FwzYzQfex/Picy90ddXM/EXuxYRFQ7RJ/vLsMDFavu4arlk17SYtZRLFtvP
-spGHssvsNvIXHBHBlbKw8ut5PY1pwOGR59MhunoDLDkzlvqStvborUSQeU/P5qKk
-jIRhwa1JMeBpIQF84t1QmjhSMjUeqxZLomJH8VZr8AmCSa1JleTCFtVupchBReON
-GMtdugt8XouvH2K+MRfzwthM95604Q/1aU54LWaR+iKihSMTyJZWKmGwBR6sEqn0
-zo2XPPJlKH9rhTT+t6BbkJSx13TOZkyfi77H0EGu+LQnB5FTrAbTH6ROypFGstxN
-qd5kQaa6KQkKD48etG5wdw5Z1UQFp57v1/OmT9d4XDYdc9wX/XO1UMtwxJUJTc3d
-4rGwZrNuY6czh/ygWdsU2da1vqPZxyOHfezmU/K2+9pAGvZae8kWlJKI5og84eVQ
-7LS2rEOmgn3Oa3FV++0auzPM/1K6Vf/tugGeAANArTdAPYVhkIM+gucm2kdiZnaj
-a7RTrLR4YxtgOCtUT06Io2Q2lzShj6U45pDFFCuvsb6WvMnVMw+1K04llyefuJ38
-WD8DhLSa9Tj6Y4MIv2ZCwWc9jAeptYlhByCb3YH5o/O74AEvPw51g0ZZ6WKqo0+P
-ZQPiLZIkW1wHzc9z/d1b
-=bN2i
+iQIcBAEBCAAGBQJRMGRLAAoJELEHsLL7fEFW6yMP/AtvbEwzRK66XkTPsKjH9Qsg
+JZtayDnrpemiCOG9ILHo7m1ISyGFIMzIn8aOFAZUxQ6R2pMqtiy/Gk0/NNgJdfm2
+UXPrjNrF6Q3hP7/MDyQvKih0V1GvR125WZEQpK6EVu7HcC+2MV38IQ+BMhn7x4i9
+Q93yXdgL9w+Ddp0gcH9wM/msGQO+xImvtoVncL/t59yhMZUJ9QclYwXymW6A0+1R
+MTG75UoWoYHbtZjYZDg1re0O7xi7yRxKjxQn1WBbTnJlzR2eqFtAXrb97s7ueG9B
+euHwGSzGIrVxqG3Oe14WC1jo9YyksxNYJp2XjCJOjed28LYRHIxZHkn4liK/lBN8
+VPzxbj/UbD5xXFVadu/8zL1WF05Pnwb1G8CzjlT/KnuZ0hLp7n+zCxE2Kcnz09rt
+iS/gj04b+J+QJaaOUEPgruuzJ1kil+XWxSu3M6TEWGnTLrsYunchsp34KOtDPS9o
+XBSa97tnKi9jKrcQDz5uTby+d1HgDANxJPgH6HJNpgneuzRmbUeSlfvqseHeLXBa
+lKf+qxP5V/9CKHg9Qn3PzB8KhQ3LgsWscMiMVw0Rm40KusPXpDIVKpblpvLnNC2S
+SRax0fmwT6XJBrWWLa/y53kMb8qf2p3H6R1jYqWmjtddJq+ZXfCZiA8wXuMbjga7
+wvDG12Y/eBLfl8uz9wka
+=cds9
-----END PGP SIGNATURE-----
diff --git a/dev-embedded/libftdi/files/libftdi-1.0-staticlibs.patch b/dev-embedded/libftdi/files/libftdi-1.0-staticlibs.patch
new file mode 100644
index 000000000000..a3ce560dbfbd
--- /dev/null
+++ b/dev-embedded/libftdi/files/libftdi-1.0-staticlibs.patch
@@ -0,0 +1,123 @@
+make static libs optional. already sent upstream.
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -46,6 +46,8 @@ set(CPACK_COMPONENT_SHAREDLIBS_GROUP "Development")
+ "Static library, good if you want to embed libftdi1 in your application.")
+ set(CPACK_COMPONENT_HEADERS_DESCRIPTION
+ "C/C++ header files.")
++
++option ( STATICLIBS "Build static libraries" ON )
+
+ set(CPACK_COMPONENT_SHAREDLIBS_GROUP "Development")
+ set(CPACK_COMPONENT_STATICLIBS_GROUP "Development")
+--- a/ftdipp/CMakeLists.txt
++++ b/ftdipp/CMakeLists.txt
+@@ -30,12 +30,16 @@ if (FTDIPP)
+ set_target_properties(ftdipp1 PROPERTIES VERSION ${VERSION_FIXUP}.${MINOR_VERSION}.0 SOVERSION 2)
+
+ # Static library
+- add_library(ftdipp1-static STATIC ${cpp_sources})
+- set_target_properties(ftdipp1-static PROPERTIES OUTPUT_NAME "ftdipp1")
++ if (STATICLIBS)
++ add_library(ftdipp1-static STATIC ${cpp_sources})
++ set_target_properties(ftdipp1-static PROPERTIES OUTPUT_NAME "ftdipp1")
++ endif (STATICLIBS)
+
+ # Prevent clobbering each other during the build
+ set_target_properties(ftdipp1 PROPERTIES CLEAN_DIRECT_OUTPUT 1)
+- set_target_properties(ftdipp1-static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
++ if (STATICLIBS)
++ set_target_properties(ftdipp1-static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
++ endif (STATICLIBS)
+
+ # Dependencies
+ target_link_libraries(ftdipp1 ftdi1 ${LIBUSB_LIBRARIES} ${BOOST_LIBRARIES})
+@@ -46,10 +50,12 @@ if (FTDIPP)
+ LIBRARY DESTINATION lib${LIB_SUFFIX}
+ COMPONENT sharedlibs
+ )
+- install( TARGETS ftdipp1-static
+- ARCHIVE DESTINATION lib${LIB_SUFFIX}
+- COMPONENT staticlibs
+- )
++ if (STATICLIBS)
++ install( TARGETS ftdipp1-static
++ ARCHIVE DESTINATION lib${LIB_SUFFIX}
++ COMPONENT staticlibs
++ )
++ endif (STATICLIBS)
+ install( FILES ${cpp_headers}
+ DESTINATION include/${PROJECT_NAME}
+ COMPONENT headers
+@@ -61,10 +67,12 @@ if (FTDIPP)
+ DESTINATION bin
+ COMPONENT sharedlibs
+ )
+- install( TARGETS ftdipp1-static
+- DESTINATION bin
+- COMPONENT staticlibs
+- )
++ if (STATICLIBS)
++ install( TARGETS ftdipp1-static
++ DESTINATION bin
++ COMPONENT staticlibs
++ )
++ endif (STATICLIBS)
+ install( FILES ${cpp_headers}
+ DESTINATION include/${PROJECT_NAME}
+ COMPONENT headers
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -28,11 +28,15 @@ set_target_properties(ftdi1 PROPERTIES VERSION ${VERSION_FIXUP}.${MINOR_VERSION}
+
+ # Static library
+ add_library(ftdi1-static STATIC ${c_sources})
+-set_target_properties(ftdi1-static PROPERTIES OUTPUT_NAME "ftdi1")
++if (STATICLIBS)
++ set_target_properties(ftdi1-static PROPERTIES OUTPUT_NAME "ftdi1")
++endif (STATICLIBS)
+
+ # Prevent clobbering each other during the build
+ set_target_properties(ftdi1 PROPERTIES CLEAN_DIRECT_OUTPUT 1)
+-set_target_properties(ftdi1-static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
++if (STATICLIBS)
++ set_target_properties(ftdi1-static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
++endif (STATICLIBS)
+
+ # Dependencies
+ target_link_libraries(ftdi1 ${LIBUSB_LIBRARIES})
+@@ -45,10 +49,12 @@ if(${UNIX})
+ COMPONENT sharedlibs
+ )
+
+- install( TARGETS ftdi1-static
+- ARCHIVE DESTINATION lib${LIB_SUFFIX}
+- COMPONENT staticlibs
+- )
++ if (STATICLIBS)
++ install( TARGETS ftdi1-static
++ ARCHIVE DESTINATION lib${LIB_SUFFIX}
++ COMPONENT staticlibs
++ )
++ endif (STATICLIBS)
+
+ install( FILES ${c_headers}
+ DESTINATION include/${PROJECT_NAME}
+@@ -64,10 +70,12 @@ if(${WIN32})
+ COMPONENT sharedlibs
+ )
+
+- install( TARGETS ftdi1-static
+- DESTINATION bin
+- COMPONENT staticlibs
+- )
++ if (STATICLIBS)
++ install( TARGETS ftdi1-static
++ DESTINATION bin
++ COMPONENT staticlibs
++ )
++ endif (STATICLIBS)
+
+ install( FILES ${c_headers}
+ DESTINATION include/${PROJECT_NAME}
diff --git a/dev-embedded/libftdi/libftdi-9999.1.0.ebuild b/dev-embedded/libftdi/libftdi-1.0.ebuild
index bf044e8abacb..497051bdc969 100644
--- a/dev-embedded/libftdi/libftdi-9999.1.0.ebuild
+++ b/dev-embedded/libftdi/libftdi-1.0.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/libftdi/libftdi-9999.1.0.ebuild,v 1.6 2012/03/30 03:45:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/libftdi/libftdi-1.0.ebuild,v 1.1 2013/03/01 08:16:55 vapier Exp $
EAPI="2"
-inherit cmake-utils
+inherit cmake-utils eutils
+MY_P="${PN}1-${PV}"
if [[ ${PV} == 9999* ]] ; then
- EGIT_REPO_URI="git://developer.intra2net.com/${PN}-${PV#9999.}"
- inherit git-2 autotools
+ EGIT_REPO_URI="git://developer.intra2net.com/${PN}"
+ inherit git-2
else
- SRC_URI="http://www.intra2net.com/en/developer/${PN}/download/${P}.tar.gz"
+ SRC_URI="http://www.intra2net.com/en/developer/${PN}/download/${MY_P}.tar.bz2"
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
fi
@@ -19,20 +20,29 @@ HOMEPAGE="http://www.intra2net.com/en/developer/libftdi/"
LICENSE="LGPL-2"
SLOT="0"
-IUSE="cxx doc examples python"
+IUSE="cxx doc examples python static-libs tools"
-RDEPEND="virtual/libusb:0
+RDEPEND="virtual/libusb:1
cxx? ( dev-libs/boost )
- python? ( dev-lang/python )"
+ python? ( dev-lang/python )
+ tools? ( dev-libs/confuse )"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen )"
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-1.0-staticlibs.patch
+}
+
src_configure() {
mycmakeargs=(
$(cmake-utils_use cxx FTDIPP)
$(cmake-utils_use doc DOCUMENTATION)
$(cmake-utils_use examples EXAMPLES)
$(cmake-utils_use python PYTHON_BINDINGS)
+ $(cmake-utils_use static-libs STATICLIBS)
+ $(cmake-utils_use tools FTDI_EEPROM)
-DCMAKE_SKIP_BUILD_RPATH=ON
)
cmake-utils_src_configure
@@ -40,7 +50,7 @@ src_configure() {
src_install() {
cmake-utils_src_install
- dodoc ChangeLog README
+ : dodoc ChangeLog README
if use doc ; then
doman doc/man/man3/*
diff --git a/dev-embedded/libftdi/libftdi-9999.ebuild b/dev-embedded/libftdi/libftdi-9999.ebuild
index 1def79a3986b..85527a7fb7d0 100644
--- a/dev-embedded/libftdi/libftdi-9999.ebuild
+++ b/dev-embedded/libftdi/libftdi-9999.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/libftdi/libftdi-9999.ebuild,v 1.6 2012/03/30 03:45:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/libftdi/libftdi-9999.ebuild,v 1.7 2013/03/01 08:16:55 vapier Exp $
EAPI="2"
-inherit cmake-utils
+inherit cmake-utils eutils
+MY_P="${PN}1-${PV}"
if [[ ${PV} == 9999* ]] ; then
EGIT_REPO_URI="git://developer.intra2net.com/${PN}"
- inherit git-2 autotools
+ inherit git-2
else
- SRC_URI="http://www.intra2net.com/en/developer/${PN}/download/${P}.tar.gz"
+ SRC_URI="http://www.intra2net.com/en/developer/${PN}/download/${MY_P}.tar.bz2"
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
fi
@@ -19,20 +20,29 @@ HOMEPAGE="http://www.intra2net.com/en/developer/libftdi/"
LICENSE="LGPL-2"
SLOT="0"
-IUSE="cxx doc examples python"
+IUSE="cxx doc examples python static-libs tools"
-RDEPEND="virtual/libusb:0
+RDEPEND="virtual/libusb:1
cxx? ( dev-libs/boost )
- python? ( dev-lang/python )"
+ python? ( dev-lang/python )
+ tools? ( dev-libs/confuse )"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen )"
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-1.0-staticlibs.patch
+}
+
src_configure() {
mycmakeargs=(
$(cmake-utils_use cxx FTDIPP)
$(cmake-utils_use doc DOCUMENTATION)
$(cmake-utils_use examples EXAMPLES)
$(cmake-utils_use python PYTHON_BINDINGS)
+ $(cmake-utils_use static-libs STATICLIBS)
+ $(cmake-utils_use tools FTDI_EEPROM)
-DCMAKE_SKIP_BUILD_RPATH=ON
)
cmake-utils_src_configure
@@ -40,7 +50,7 @@ src_configure() {
src_install() {
cmake-utils_src_install
- dodoc ChangeLog README
+ : dodoc ChangeLog README
if use doc ; then
doman doc/man/man3/*
diff --git a/dev-embedded/libftdi/metadata.xml b/dev-embedded/libftdi/metadata.xml
index 92114080841c..3f860e47416b 100644
--- a/dev-embedded/libftdi/metadata.xml
+++ b/dev-embedded/libftdi/metadata.xml
@@ -2,4 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>dev-embedded</herd>
+<use>
+ <flag name='tools'>build ftdi_eeprom helper tool</flag>
+</use>
</pkgmetadata>