Make the CXX support optional, but not removed by default, per bug #175117.

Package-Manager: portage-2.1.5.4

3 files changed, 78 insertions, 2 deletions

diff --git a/dev-libs/libusb/ChangeLog b/dev-libs/libusb/ChangeLog
index 69acebf0acc0..02611dc151f4 100644
--- a/dev-libs/libusb/ChangeLog
+++ b/dev-libs/libusb/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/libusb
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/ChangeLog,v 1.79 2008/05/11 02:28:05 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/ChangeLog,v 1.80 2008/06/07 00:59:04 robbat2 Exp $
+
+*libusb-0.1.12-r3 (07 Jun 2008)
+
+  07 Jun 2008; Robin H. Johnson <robbat2@gentoo.org>
+  +libusb-0.1.12-r3.ebuild:
+  Make the CXX support optional, but not removed by default, per bug
+  #175117.
 
 *libusb-0.1.12-r2 (11 May 2008)
 
diff --git a/dev-libs/libusb/Manifest b/dev-libs/libusb/Manifest
index f92cb44f13e5..4bb5c254f571 100644
--- a/dev-libs/libusb/Manifest
+++ b/dev-libs/libusb/Manifest
@@ -5,6 +5,7 @@ DIST libusb-0.1.12.tar.gz 389343 RMD160 63848df717e00fff67ab30ba86a85466370d4e8e
 EBUILD libusb-0.1.11.ebuild 1057 RMD160 422a10490c31d9448983f0c517223175f69f2a39 SHA1 08d1f4928505a70b44c1abb197f0d11aff825ee1 SHA256 b4b1d113c64159ead308fe07c2eefd399c737a1433082aafdf39f34498e61074
 EBUILD libusb-0.1.12-r1.ebuild 1785 RMD160 b9c6c17a3e419437b54ff83fa22f98701836202b SHA1 09333cbea1aabd7728a6522473b55ce235aa1842 SHA256 e94ebdab3175dc192296c83258ce1ee1cae57a624b37447a35d04218d3a9fdb0
 EBUILD libusb-0.1.12-r2.ebuild 1844 RMD160 2a74195021a8afbabc431329cc42ce5822f6d6fd SHA1 1e071a0ea3079325b4fb0efddfbd8c270b9607c8 SHA256 f6330908600b012827e3d5ee939e37cbe0bff480f287e7b426d92f983e105d86
+EBUILD libusb-0.1.12-r3.ebuild 1935 RMD160 2f656c60618e6e8552aa9f81414497ff4abd348a SHA1 1b21f53ce7d43baa72953ec7bc59ee1f06e8c748 SHA256 fc7569f32dcbc088b2eb650721b18a24351c9567746da66e483df51c17cf7cf0
 EBUILD libusb-0.1.12.ebuild 1479 RMD160 2f7eab3f81707b1ec795bd5ef52d930e3b9ddaef SHA1 d75b22c0bbbdaae4af7650ce746a37fc0e5f927f SHA256 628c8e0c045ff8df28b90c5182bda251e28a49c858de4d8ca77f4d383809f734
-MISC ChangeLog 9685 RMD160 435d33c88a3d48c390be4c7febe795a7c1216b46 SHA1 a9578b81e7358d0e9e54c9e7ada118072ddf005c SHA256 ec10865e0f209a290e9009d1cbe43dbd35d1a7eda66e8551c2c6c4c0556c5b51
+MISC ChangeLog 9882 RMD160 e557df0797e0290249cd1e4c0d58152448e2978d SHA1 a2e62962880fd01f5cd3e58b54e91adda89217e0 SHA256 f23425bf8770743a54182dee52e806bfb59fc47f76e14db8874ebd881359f8a1
 MISC metadata.xml 226 RMD160 648b1f4c4f30d91596a8bb5ee6713abbe558d1ee SHA1 454eb537623437bf8d58ae3cd0418e6a898bac61 SHA256 32bd7ea3d52eaade1cad03a261cd0f75ae3b0d10787fe646ece11c752b1cdfd2
diff --git a/dev-libs/libusb/libusb-0.1.12-r3.ebuild b/dev-libs/libusb/libusb-0.1.12-r3.ebuild
new file mode 100644
index 000000000000..784c0e6e41b1
--- /dev/null
+++ b/dev-libs/libusb/libusb-0.1.12-r3.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/libusb-0.1.12-r3.ebuild,v 1.1 2008/06/07 00:59:04 robbat2 Exp $
+
+WANT_AUTOMAKE="latest"
+WANT_AUTOCONF="latest"
+inherit eutils libtool autotools toolchain-funcs
+
+DESCRIPTION="Userspace access to USB devices"
+HOMEPAGE="http://libusb.sourceforge.net/"
+SRC_URI="mirror://sourceforge/libusb/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="debug doc nocxx"
+RESTRICT="test"
+
+RDEPEND=""
+DEPEND="doc? ( app-text/openjade
+	app-text/docbook-dsssl-stylesheets
+	app-text/docbook-sgml-utils
+	~app-text/docbook-sgml-dtd-4.2 )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i -e 's:-Werror::' Makefile.am
+	sed -i 's:AC_LANG_CPLUSPLUS:AC_PROG_CXX:' configure.in #213800
+	epatch "${FILESDIR}"/${PV}-fbsd.patch
+	use nocxx && epatch "${FILESDIR}"/libusb-0.1.12-nocpp.patch
+	eautoreconf
+	elibtoolize
+
+	# Ensure that the documentation actually finds the DTD it needs
+	docbookdtd="/usr/share/sgml/docbook/sgml-dtd-4.2/docbook.dtd"
+	sysid='"-//OASIS//DTD DocBook V4.2//EN"'
+	sed -r -i -e \
+	"s,(${sysid}) \[\$,\1 \"${docbookdtd}\" \[,g" \
+	"${S}"/doc/manual.sgml
+}
+
+src_compile() {
+	econf \
+		$(use_enable debug debug all) \
+		$(use_enable doc build-docs) \
+		--libdir /usr/$(get_libdir) \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install || die "make install failed"
+
+	dodir /$(get_libdir)
+	mv "${D}"/usr/$(get_libdir)/*.so* "${D}"/$(get_libdir) \
+		|| die "Failed to put dynamic libs in /$(get_libdir)"
+
+	use nocxx && rm -f "${D}"/usr/include/usbpp.h
+
+	gen_usr_ldscript libusb.so
+	use nocxx || gen_usr_ldscript libusbpp.so
+
+	dodoc AUTHORS NEWS README || die "dodoc failed"
+	if use doc ; then
+		dohtml doc/html/*.html || die "dohtml failed"
+	fi
+}