Remove manpage compression from build-system (bug 418175, thanks Jason Donenfeld)

(Portage version: 2.1.10.63/cvs/Linux x86_64)

4 files changed, 53 insertions, 38 deletions

diff --git a/net-analyzer/netsniff-ng/ChangeLog b/net-analyzer/netsniff-ng/ChangeLog
index e11d4e1942db..48ee678803c3 100644
--- a/net-analyzer/netsniff-ng/ChangeLog
+++ b/net-analyzer/netsniff-ng/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/netsniff-ng
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netsniff-ng/ChangeLog,v 1.2 2012/04/07 09:42:59 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netsniff-ng/ChangeLog,v 1.3 2012/05/29 20:46:01 xmw Exp $
+
+  29 May 2012; Michael Weber <xmw@gentoo.org> -netsniff-ng-0.5.5.0.ebuild,
+  netsniff-ng-0.5.6.ebuild, +files/netsniff-ng-0.5.6-man-no-compress.patch:
+  Remove manpage compression from build-system (bug 418175, thanks Jason
+  Donenfeld)
 
 *netsniff-ng-0.5.6 (07 Apr 2012)
 
diff --git a/net-analyzer/netsniff-ng/files/netsniff-ng-0.5.6-man-no-compress.patch b/net-analyzer/netsniff-ng/files/netsniff-ng-0.5.6-man-no-compress.patch
new file mode 100644
index 000000000000..5c4f66ec8391
--- /dev/null
+++ b/net-analyzer/netsniff-ng/files/netsniff-ng-0.5.6-man-no-compress.patch
@@ -0,0 +1,41 @@
+--- netsniff-ng-0.5.6/src/cmake/modules/Pod2Man.cmake
++++ netsniff-ng-0.5.6/src/cmake/modules/Pod2Man.cmake
+@@ -12,16 +12,11 @@
+ 
+ MACRO(POD2MAN PODFILE MANFILE SECTION)
+ 	FIND_PROGRAM(POD2MAN pod2man)
+-	FIND_PROGRAM(GZIP gzip)
+ 
+ 	IF(NOT POD2MAN)
+ 		MESSAGE(FATAL ERROR "Need pod2man installed to generate man page")
+ 	ENDIF(NOT POD2MAN)
+ 
+-	IF(NOT GZIP)
+-		MESSAGE(FATAL ERROR "Need gzip installed to compress man page")
+-	ENDIF(NOT GZIP)
+-
+ 	IF(NOT EXISTS ${PODFILE})
+ 		MESSAGE(FATAL ERROR "Could not find pod file ${PODFILE} to generate man page")
+ 	ENDIF(NOT EXISTS ${PODFILE})
+@@ -34,19 +29,13 @@
+ 		${PODFILE} > ${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION}
+ 	)
+ 
+-	ADD_CUSTOM_COMMAND(
+-		OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION}.gz
+-		COMMAND ${GZIP} -c ${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION} > ${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION}.gz
+-		DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION}
+-	)
+-
+ 	SET(MANPAGE_TARGET "man-${MANFILE}")
+ 
+-	ADD_CUSTOM_TARGET(${MANPAGE_TARGET} DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION}.gz)
++	ADD_CUSTOM_TARGET(${MANPAGE_TARGET} DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION})
+ 	ADD_DEPENDENCIES(man ${MANPAGE_TARGET})
+ 
+ 	INSTALL(
+-		FILES ${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION}.gz
++		FILES ${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION}
+ 		DESTINATION share/man/man${SECTION}
+     	)
+ ENDMACRO(POD2MAN PODFILE MANFILE SECTION)
diff --git a/net-analyzer/netsniff-ng/netsniff-ng-0.5.5.0.ebuild b/net-analyzer/netsniff-ng/netsniff-ng-0.5.5.0.ebuild
deleted file mode 100644
index aed92ce10333..000000000000
--- a/net-analyzer/netsniff-ng/netsniff-ng-0.5.5.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netsniff-ng/netsniff-ng-0.5.5.0.ebuild,v 1.1 2011/09/10 16:36:05 xmw Exp $
-
-EAPI=3
-
-inherit toolchain-funcs
-
-DESCRIPTION="high performance network sniffer for packet inspection"
-HOMEPAGE="http://netsniff-ng.org/"
-SRC_URI="http://www.${PN}.org/pub/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S=${WORKDIR}/${PN}/src
-
-src_prepare() {
-	sed \
-		-e "/CC_NORM/,+1s/gcc/$(tc-getCC)/" \
-		-e "/LD_NORM/,+1s/gcc/$(tc-getCC)/" \
-		-i definitions.mk || die
-	echo "CFLAGS = ${CFLAGS} -std=gnu99" >> definitions.mk || die
-	echo "LIBS += ${LDFLAGS}" >> definitions.mk || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc ../{AUTHORS,CHANGELOG,CODING,CREDITS,HACKING,README,TODO} || die
-}
diff --git a/net-analyzer/netsniff-ng/netsniff-ng-0.5.6.ebuild b/net-analyzer/netsniff-ng/netsniff-ng-0.5.6.ebuild
index cd5124fea915..d251cf8db08c 100644
--- a/net-analyzer/netsniff-ng/netsniff-ng-0.5.6.ebuild
+++ b/net-analyzer/netsniff-ng/netsniff-ng-0.5.6.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netsniff-ng/netsniff-ng-0.5.6.ebuild,v 1.1 2012/04/07 09:42:58 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netsniff-ng/netsniff-ng-0.5.6.ebuild,v 1.2 2012/05/29 20:46:01 xmw Exp $
 
 EAPI=4
 
-inherit cmake-utils
+inherit cmake-utils eutils
 
 DESCRIPTION="high performance network sniffer for packet inspection"
 HOMEPAGE="http://netsniff-ng.org/"
@@ -20,6 +20,10 @@ RDEPEND=""
 
 S=${WORKDIR}/${P}/src
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-man-no-compress.patch
+}
+
 src_install() {
 	cmake-utils_src_install
 	dodoc ../{AUTHORS,MAINTAINER,PROJECTS,README,REPORTING-BUGS,THANKS}