Version bump.

(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)

5 files changed, 174 insertions, 21 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/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>