rolling back major no no of third-party patches for wireshark

(Portage version: 2.1.11.5/cvs/Linux x86_64)

5 files changed, 9 insertions, 128 deletions

diff --git a/net-libs/libbtbb/ChangeLog b/net-libs/libbtbb/ChangeLog
index bc8dd2f1005d..176cd420cf49 100644
--- a/net-libs/libbtbb/ChangeLog
+++ b/net-libs/libbtbb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/libbtbb
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libbtbb/ChangeLog,v 1.6 2012/07/09 19:02:02 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libbtbb/ChangeLog,v 1.7 2012/07/11 21:42:13 zerochaos Exp $
+
+  11 Jul 2012; Rick Farina <zerochaos@gentoo.org>
+  -files/wireshark-1.8-btbb.patch, -libbtbb-0.8-r1.ebuild, libbtbb-0.8.ebuild,
+  libbtbb-9999.ebuild:
+  rolling back major no no of third-party patches for wireshark
 
 *libbtbb-0.8-r1 (09 Jul 2012)
 
diff --git a/net-libs/libbtbb/files/wireshark-1.8-btbb.patch b/net-libs/libbtbb/files/wireshark-1.8-btbb.patch
deleted file mode 100644
index a5403e4e037c..000000000000
--- a/net-libs/libbtbb/files/wireshark-1.8-btbb.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff -urN wireshark-1.8.0.orig//CMakeLists.txt wireshark-1.8.0/CMakeLists.txt
---- wireshark-1.8.0.orig//CMakeLists.txt	2012-06-06 00:33:43.000000000 +0800
-+++ wireshark-1.8.0/CMakeLists.txt	2012-06-25 21:48:57.997186003 +0800
-@@ -409,6 +409,7 @@
- 	set(PLUGIN_DIR="${DATAFILE_DIR}/plugins/${CPACK_PACKAGE_VERSION}")
- 	set(PLUGIN_SRC_DIRS
- 		plugins/asn1
-+		plugins/btbb
- 		plugins/docsis
- 		plugins/ethercat
- 		plugins/gryphon
-diff -urN wireshark-1.8.0.orig//Makefile.am wireshark-1.8.0/Makefile.am
---- wireshark-1.8.0.orig//Makefile.am	2012-06-20 01:47:22.000000000 +0800
-+++ wireshark-1.8.0/Makefile.am	2012-06-25 21:50:00.721186002 +0800
-@@ -273,6 +273,7 @@
- -include plugins/Custom.make
- plugin_ldadd = $(_CUSTOM_plugin_ldadd_) \
- 	-dlopen plugins/asn1/asn1.la \
-+	-dlopen plugins/btbb/btbb.la \
- 	-dlopen plugins/docsis/docsis.la \
- 	-dlopen plugins/ethercat/ethercat.la \
- 	-dlopen plugins/gryphon/gryphon.la \
-diff -urN wireshark-1.8.0.orig//configure.in wireshark-1.8.0/configure.in
---- wireshark-1.8.0.orig//configure.in	2012-06-22 02:21:10.000000000 +0800
-+++ wireshark-1.8.0/configure.in	2012-06-25 21:51:10.925186002 +0800
-@@ -2096,6 +2096,7 @@
-   packaging/svr4/pkginfo
-   plugins/Makefile
-   plugins/asn1/Makefile
-+  plugins/btbb/Makefile
-   plugins/docsis/Makefile
-   plugins/ethercat/Makefile
-   plugins/gryphon/Makefile
-diff -urN wireshark-1.8.0.orig//epan/Makefile.am wireshark-1.8.0/epan/Makefile.am
---- wireshark-1.8.0.orig//epan/Makefile.am	2012-06-09 08:46:54.000000000 +0800
-+++ wireshark-1.8.0/epan/Makefile.am	2012-06-25 21:51:55.394186002 +0800
-@@ -209,6 +209,8 @@
- -include ../plugins/Custom.make
- plugin_src = \
- 	../plugins/asn1/packet-asn1.c \
-+	../plugins/btbb/packet-btbb.c \
-+	../plugins/btbb/packet-btlmp.c \
- 	../plugins/docsis/packet-bintrngreq.c \
- 	../plugins/docsis/packet-bpkmattr.c \
- 	../plugins/docsis/packet-bpkmreq.c \
-diff -urN wireshark-1.8.0.orig//packaging/nsis/Makefile.nmake wireshark-1.8.0/packaging/nsis/Makefile.nmake
---- wireshark-1.8.0.orig//packaging/nsis/Makefile.nmake	2012-06-20 01:47:22.000000000 +0800
-+++ wireshark-1.8.0/packaging/nsis/Makefile.nmake	2012-06-25 21:52:34.248186002 +0800
-@@ -46,6 +46,7 @@
- 
- PLUGINS= \
- 	../../plugins/asn1/asn1.dll \
-+	../../plugins/btbb/btbb.dll \
- 	../../plugins/docsis/docsis.dll \
- 	../../plugins/ethercat/ethercat.dll \
- 	../../plugins/gryphon/gryphon.dll \
-diff -urN wireshark-1.8.0.orig//packaging/nsis/wireshark.nsi wireshark-1.8.0/packaging/nsis/wireshark.nsi
---- wireshark-1.8.0.orig//packaging/nsis/wireshark.nsi	2012-06-20 01:47:22.000000000 +0800
-+++ wireshark-1.8.0/packaging/nsis/wireshark.nsi	2012-06-25 21:54:50.288185993 +0800
-@@ -806,6 +806,7 @@
- ;-------------------------------------------
- SetOutPath '$INSTDIR\plugins\${VERSION}'
- File "${STAGING_DIR}\plugins\${VERSION}\asn1.dll"
-+File "${STAGING_DIR}\plugins\${VERSION}\btbb.dll"
- File "${STAGING_DIR}\plugins\${VERSION}\docsis.dll"
- File "${STAGING_DIR}\plugins\${VERSION}\ethercat.dll"
- File "${STAGING_DIR}\plugins\${VERSION}\gryphon.dll"
-diff -urN wireshark-1.8.0.orig//plugins/Makefile.am wireshark-1.8.0/plugins/Makefile.am
---- wireshark-1.8.0.orig//plugins/Makefile.am	2012-06-06 00:33:17.000000000 +0800
-+++ wireshark-1.8.0/plugins/Makefile.am	2012-06-25 21:55:15.766186001 +0800
-@@ -24,6 +24,7 @@
- -include Custom.make
- SUBDIRS = $(_CUSTOM_SUBDIRS_) \
- 	asn1 \
-+	btbb \
- 	docsis \
- 	ethercat \
- 	gryphon \
-diff -urN wireshark-1.8.0.orig//plugins/Makefile.nmake wireshark-1.8.0/plugins/Makefile.nmake
---- wireshark-1.8.0.orig//plugins/Makefile.nmake	2012-06-06 00:33:17.000000000 +0800
-+++ wireshark-1.8.0/plugins/Makefile.nmake	2012-06-25 21:55:32.469186000 +0800
-@@ -8,6 +8,7 @@
- 
- PLUGIN_LIST = \
- 	asn1        \
-+	btbb        \
- 	docsis      \
- 	ethercat    \
- 	gryphon     \
diff --git a/net-libs/libbtbb/libbtbb-0.8-r1.ebuild b/net-libs/libbtbb/libbtbb-0.8-r1.ebuild
deleted file mode 100644
index 4d6ed4af524d..000000000000
--- a/net-libs/libbtbb/libbtbb-0.8-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libbtbb/libbtbb-0.8-r1.ebuild,v 1.1 2012/07/09 19:02:02 zerochaos Exp $
-
-EAPI=4
-
-inherit multilib
-
-DESCRIPTION="A library to decode Bluetooth baseband packets"
-HOMEPAGE="http://libbtbb.sourceforge.net/"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="http://git.code.sf.net/p/libbtbb/code"
-	inherit git-2
-	KEYWORDS=""
-else
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins -r wireshark
-	insinto /usr/share/${PN}/wireshark/plugins/btbb/
-	doins "${FILESDIR}"/wireshark-1.8-btbb.patch
-
-	dodir /usr/$(get_libdir)
-	dodir /usr/include
-	emake LDCONFIG=true DESTDIR="${D}" INSTALL_DIR="${ED}/usr/$(get_libdir)" INCLUDE_DIR="${ED}/usr/include" install
-}
diff --git a/net-libs/libbtbb/libbtbb-0.8.ebuild b/net-libs/libbtbb/libbtbb-0.8.ebuild
index 34e575b522b3..701d779ebad8 100644
--- a/net-libs/libbtbb/libbtbb-0.8.ebuild
+++ b/net-libs/libbtbb/libbtbb-0.8.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/net-libs/libbtbb/libbtbb-0.8.ebuild,v 1.1 2012/07/05 23:12:15 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libbtbb/libbtbb-0.8.ebuild,v 1.2 2012/07/11 21:42:13 zerochaos Exp $
 
 EAPI=4
 
@@ -11,6 +11,7 @@ HOMEPAGE="http://libbtbb.sourceforge.net/"
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="http://git.code.sf.net/p/libbtbb/code"
+	SRC_URI=""
 	inherit git-2
 	KEYWORDS=""
 else
diff --git a/net-libs/libbtbb/libbtbb-9999.ebuild b/net-libs/libbtbb/libbtbb-9999.ebuild
index 1f77a9d66136..a005f4d1d448 100644
--- a/net-libs/libbtbb/libbtbb-9999.ebuild
+++ b/net-libs/libbtbb/libbtbb-9999.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/net-libs/libbtbb/libbtbb-9999.ebuild,v 1.5 2012/07/09 19:02:02 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libbtbb/libbtbb-9999.ebuild,v 1.6 2012/07/11 21:42:13 zerochaos Exp $
 
 EAPI=4
 
@@ -24,8 +24,6 @@ SLOT="0"
 IUSE=""
 
 src_install() {
-	insinto /usr/share/${PN}
-	doins -r wireshark
 	dodir /usr/$(get_libdir)
 	dodir /usr/include
 	emake LDCONFIG=true DESTDIR="${D}" INSTALL_DIR="${ED}/usr/$(get_libdir)" INCLUDE_DIR="${ED}/usr/include" install