diff options
| -rw-r--r-- | net-analyzer/upnpscan/ChangeLog | 6 | ||||
| -rw-r--r-- | net-analyzer/upnpscan/Manifest | 7 | ||||
| -rw-r--r-- | net-analyzer/upnpscan/files/upnpscan-0.4-cflags.patch | 59 | ||||
| -rw-r--r-- | net-analyzer/upnpscan/files/upnpscan-0.4-r2-cflags.patch | 51 | ||||
| -rw-r--r-- | net-analyzer/upnpscan/upnpscan-0.4-r2.ebuild | 4 |
5 files changed, 76 insertions, 51 deletions
diff --git a/net-analyzer/upnpscan/ChangeLog b/net-analyzer/upnpscan/ChangeLog index 6d74ec153ec9..c1777795c854 100644 --- a/net-analyzer/upnpscan/ChangeLog +++ b/net-analyzer/upnpscan/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-analyzer/upnpscan # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/upnpscan/ChangeLog,v 1.9 2010/11/01 04:17:09 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/upnpscan/ChangeLog,v 1.10 2010/11/01 04:32:45 jer Exp $ + + 01 Nov 2010; Jeroen Roovers <jer@gentoo.org> upnpscan-0.4-r2.ebuild, + files/upnpscan-0.4-cflags.patch, +files/upnpscan-0.4-r2-cflags.patch: + Readd the old patch or we introduce more QA issues to -r0. *upnpscan-0.4-r2 (01 Nov 2010) diff --git a/net-analyzer/upnpscan/Manifest b/net-analyzer/upnpscan/Manifest index 8b5e0682b118..a37f0aab4d77 100644 --- a/net-analyzer/upnpscan/Manifest +++ b/net-analyzer/upnpscan/Manifest @@ -1,6 +1,7 @@ -AUX upnpscan-0.4-cflags.patch 967 RMD160 d530768411221778d5c97638e744817ffd414bbc SHA1 b80c9f6e5aea381a6d6af5e4f41c01e029506951 SHA256 d6d5a0cffa816fb8314e7e8d36d986b5d6cce8d0353cf18c885aad8027633d76 +AUX upnpscan-0.4-cflags.patch 386 RMD160 eb31d813c76f83355d1c70e175f12ccbb3263673 SHA1 655fc54a5b71c00c3e908fd821f14ddd38a34ef0 SHA256 391a60882b814a105d05073502082422eab9c81253294579318982d70fe199bc +AUX upnpscan-0.4-r2-cflags.patch 967 RMD160 d530768411221778d5c97638e744817ffd414bbc SHA1 b80c9f6e5aea381a6d6af5e4f41c01e029506951 SHA256 d6d5a0cffa816fb8314e7e8d36d986b5d6cce8d0353cf18c885aad8027633d76 DIST upnpscan-v0.4-src.tgz 309011 RMD160 ed32678ec25f2627a36d622cba8548bec87faf9e SHA1 d15125d147ef962107fc3f01b52160d50f0d8710 SHA256 0d41d63efcc9ed15133306d9996ec72a07ddb047552fca0ac417eeb412db045b -EBUILD upnpscan-0.4-r2.ebuild 627 RMD160 a474877592b2579649813b4ba51edaeae3f7413f SHA1 0c67780b4ad954888e021e2d8609736ed3ca10bf SHA256 293453290cf6bdbd763c116a2cfe721f63449e240083c771358ba10aaee22071 +EBUILD upnpscan-0.4-r2.ebuild 628 RMD160 298ae556c5da22656dd39a740d228e3bee2a2458 SHA1 e6cd8b5dec4ab6fc4eee71ce5a686ffc7a92d6a8 SHA256 9cfbf56e3f81729042ff91d9d9202d052f57ecd04f30bb30d0edce9ebe47b43a EBUILD upnpscan-0.4.ebuild 750 RMD160 c37b09265afc14ac69351d36990a1bee92c9f2c8 SHA1 6ab2e4e5eb5f294c237f7a86e2b5b6ad3a3da4cb SHA256 fafc7b9ca07fcbd333675e03d9c161550b0521a9a68b693fb937cc68237da10e -MISC ChangeLog 1653 RMD160 0303786c02eff28036f6cc0e85435f5b157f0d53 SHA1 c7ba0fc1415b8346a2d2c449a801a3d95b14c4e5 SHA256 f810f180e6da7b6221c2f75c34349b180e2a611138941a3f4d9d09c8ce1e18be +MISC ChangeLog 1859 RMD160 8e1a76d8a50305baa774179ff1b9d5ca002b04fe SHA1 e1e73310cfa7a70400c888795430404f2fe73b0d SHA256 0315bb666d21bd151ed81c81350bf27ec81bf1c563687f0280cb3892533aabdb MISC metadata.xml 489 RMD160 3021d509b72966bf53221089aea8da93effb6423 SHA1 cec17e96962b80c5f7d5558923a34f58ec2efc7d SHA256 2ce01dcdcb4b0fa86d918da81c5c3251d038da3b287d7101690838dc25788a0c diff --git a/net-analyzer/upnpscan/files/upnpscan-0.4-cflags.patch b/net-analyzer/upnpscan/files/upnpscan-0.4-cflags.patch index 46be9888ec7c..f7632d7f005b 100644 --- a/net-analyzer/upnpscan/files/upnpscan-0.4-cflags.patch +++ b/net-analyzer/upnpscan/files/upnpscan-0.4-cflags.patch @@ -1,51 +1,20 @@ ---- a/configure.in 2005-06-23 17:02:57.000000000 +0200 -+++ b/configure.in 2010-11-01 04:44:44.000000000 +0100 -@@ -8,12 +8,10 @@ - AM_CONFIG_HEADER(config.h) - - AC_ISC_POSIX --CFLAGS="" - AC_SUBST(CFLAGS) - AC_PROG_CC - AM_PROG_CC_STDC - AC_HEADER_STDC --AM_PROG_LIBTOOL - - dnl Checks for programs. - ---- a/Makefile.am 2005-06-23 12:32:13.000000000 +0200 -+++ b/Makefile.am 2010-11-01 04:46:41.000000000 +0100 -@@ -5,20 +5,6 @@ - - SUBDIRS = src - --upnpscandocdir = ${prefix}/doc/upnpscan --upnpscandoc_DATA = \ -- README\ -- COPYING\ -- AUTHORS\ -- ChangeLog\ -- INSTALL\ -- NEWS\ -- TODO -- --EXTRA_DIST = $(upnpscandoc_DATA) -- -- -- - # Copy all the spec files. Of cource, only one is actually used. - dist-hook: - for specfile in *.spec; do \ ---- a/src/Makefile.am 2005-06-21 22:57:32.000000000 +0200 -+++ b/src/Makefile.am 2010-11-01 04:53:22.000000000 +0100 -@@ -7,10 +7,6 @@ - INCLUDES =\ +--- upnpscan/src/Makefile.in.orig 2005-06-23 17:03:51.000000000 +0200 ++++ upnpscan/src/Makefile.in 2009-01-15 08:42:52.000000000 +0100 +@@ -82,7 +82,6 @@ + AWK = @AWK@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ +-CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CXX = @CXX@ +@@ -181,8 +180,7 @@ -I../include --AM_CFLAGS =\ + AM_CFLAGS = \ - -Wall\ - -g -- - bin_PROGRAMS = upnpscan ++ -Wall upnpscan_SOURCES = \ + upnpscan.c\ diff --git a/net-analyzer/upnpscan/files/upnpscan-0.4-r2-cflags.patch b/net-analyzer/upnpscan/files/upnpscan-0.4-r2-cflags.patch new file mode 100644 index 000000000000..46be9888ec7c --- /dev/null +++ b/net-analyzer/upnpscan/files/upnpscan-0.4-r2-cflags.patch @@ -0,0 +1,51 @@ +--- a/configure.in 2005-06-23 17:02:57.000000000 +0200 ++++ b/configure.in 2010-11-01 04:44:44.000000000 +0100 +@@ -8,12 +8,10 @@ + AM_CONFIG_HEADER(config.h) + + AC_ISC_POSIX +-CFLAGS="" + AC_SUBST(CFLAGS) + AC_PROG_CC + AM_PROG_CC_STDC + AC_HEADER_STDC +-AM_PROG_LIBTOOL + + dnl Checks for programs. + +--- a/Makefile.am 2005-06-23 12:32:13.000000000 +0200 ++++ b/Makefile.am 2010-11-01 04:46:41.000000000 +0100 +@@ -5,20 +5,6 @@ + + SUBDIRS = src + +-upnpscandocdir = ${prefix}/doc/upnpscan +-upnpscandoc_DATA = \ +- README\ +- COPYING\ +- AUTHORS\ +- ChangeLog\ +- INSTALL\ +- NEWS\ +- TODO +- +-EXTRA_DIST = $(upnpscandoc_DATA) +- +- +- + # Copy all the spec files. Of cource, only one is actually used. + dist-hook: + for specfile in *.spec; do \ +--- a/src/Makefile.am 2005-06-21 22:57:32.000000000 +0200 ++++ b/src/Makefile.am 2010-11-01 04:53:22.000000000 +0100 +@@ -7,10 +7,6 @@ + INCLUDES =\ + -I../include + +-AM_CFLAGS =\ +- -Wall\ +- -g +- + bin_PROGRAMS = upnpscan + + upnpscan_SOURCES = \ diff --git a/net-analyzer/upnpscan/upnpscan-0.4-r2.ebuild b/net-analyzer/upnpscan/upnpscan-0.4-r2.ebuild index 997579708f85..da6ed52dca8f 100644 --- a/net-analyzer/upnpscan/upnpscan-0.4-r2.ebuild +++ b/net-analyzer/upnpscan/upnpscan-0.4-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/upnpscan/upnpscan-0.4-r2.ebuild,v 1.1 2010/11/01 04:17:09 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/upnpscan/upnpscan-0.4-r2.ebuild,v 1.2 2010/11/01 04:32:45 jer Exp $ EAPI="2" @@ -18,7 +18,7 @@ IUSE="" S="${WORKDIR}/${PN}" src_prepare() { - epatch "${FILESDIR}"/${P}-cflags.patch + epatch "${FILESDIR}"/${PF}-cflags.patch eautoreconf } |