Version bump for bug 181715 thanks to wschlich

Package-Manager: portage-2.1.3.12

9 files changed, 113 insertions, 47 deletions

diff --git a/net-libs/openslp/ChangeLog b/net-libs/openslp/ChangeLog
index 2566fee2825c..2b58f5190cf3 100644
--- a/net-libs/openslp/ChangeLog
+++ b/net-libs/openslp/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-libs/openslp
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/openslp/ChangeLog,v 1.43 2007/08/30 13:18:53 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openslp/ChangeLog,v 1.44 2007/10/14 07:55:57 genstef Exp $
+
+*openslp-1.3.0 (14 Oct 2007)
+
+  14 Oct 2007; Stefan Schweizer <genstef@gentoo.org>
+  +files/openslp-compile_fix.patch, +files/openslp-no_install_doc.patch,
+  +files/openslp-opt.patch, -openslp-1.2.1.ebuild, openslp-1.2.1-r1.ebuild,
+  +openslp-1.3.0.ebuild:
+  Version bump for bug 181715 thanks to wschlich
 
   30 Aug 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing liquidx from metadata due to his retirement (see #171155 for
diff --git a/net-libs/openslp/Manifest b/net-libs/openslp/Manifest
index ffe556162efe..58aa32d3dffb 100644
--- a/net-libs/openslp/Manifest
+++ b/net-libs/openslp/Manifest
@@ -1,41 +1,44 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX openslp-1.2.1-fbsd.patch 346 RMD160 e44601bd0529ed38b2d51faaa37628ebc4600927 SHA1 1f2b53e69befb910fad574a873d6845eecc5822e SHA256 131caf1dafc81f519d2e50bead9a2658e4efcb3594777ab189fd60a23f097da9
 MD5 a4fd1073d151f2454579eb6507088ca1 files/openslp-1.2.1-fbsd.patch 346
 RMD160 e44601bd0529ed38b2d51faaa37628ebc4600927 files/openslp-1.2.1-fbsd.patch 346
 SHA256 131caf1dafc81f519d2e50bead9a2658e4efcb3594777ab189fd60a23f097da9 files/openslp-1.2.1-fbsd.patch 346
+AUX openslp-compile_fix.patch 574 RMD160 315a9f05b5a7b84f4e6ec4c1cd64106a9310a5b9 SHA1 3576d1c626e279815ed0ffe2414c30f6fd1cdfa7 SHA256 421b03369c0a1360a8d1363bc01d5cc6e60a303a1d0abd3644680f1d2487b7d4
+MD5 4298e5447abb9cbbbafd1de926e833a0 files/openslp-compile_fix.patch 574
+RMD160 315a9f05b5a7b84f4e6ec4c1cd64106a9310a5b9 files/openslp-compile_fix.patch 574
+SHA256 421b03369c0a1360a8d1363bc01d5cc6e60a303a1d0abd3644680f1d2487b7d4 files/openslp-compile_fix.patch 574
+AUX openslp-no_install_doc.patch 678 RMD160 790bcc1490be78f14ebdd27f68e06556c7e7e65a SHA1 851e4ec85b06a16732df5cb1dda520a122d65a62 SHA256 9da35fee802bb3463a8d5c3b8522a009ff1d29c2ba35b623010124c1b8215343
+MD5 12542f0ee02c67dd8a5e2ac403421f49 files/openslp-no_install_doc.patch 678
+RMD160 790bcc1490be78f14ebdd27f68e06556c7e7e65a files/openslp-no_install_doc.patch 678
+SHA256 9da35fee802bb3463a8d5c3b8522a009ff1d29c2ba35b623010124c1b8215343 files/openslp-no_install_doc.patch 678
+AUX openslp-opt.patch 949 RMD160 1ec7491e5047d88e9686e51954ca8f832119d40e SHA1 6c8dd36bcd04f320af9f81a443afd28afdf6ec3c SHA256 125e94c06af9091556ad0ce8f428368853dec8be2547e71f1d1f82915f0a1785
+MD5 6c5cd553ae69ab3dd698f1a59d1556d6 files/openslp-opt.patch 949
+RMD160 1ec7491e5047d88e9686e51954ca8f832119d40e files/openslp-opt.patch 949
+SHA256 125e94c06af9091556ad0ce8f428368853dec8be2547e71f1d1f82915f0a1785 files/openslp-opt.patch 949
 AUX slpd-init 2309 RMD160 57a6c5753783142ad54643a9796b054c31d5b6c4 SHA1 875b7bb64426e43cf38c2e8781b674a8ad531574 SHA256 53242a4f0c370b06394806767d1ea6d492b5882a3319fe75c0316e557ffbb773
 MD5 b607c277e7d510e85d7da3c2574628f7 files/slpd-init 2309
 RMD160 57a6c5753783142ad54643a9796b054c31d5b6c4 files/slpd-init 2309
 SHA256 53242a4f0c370b06394806767d1ea6d492b5882a3319fe75c0316e557ffbb773 files/slpd-init 2309
 DIST openslp-1.2.1.tar.gz 886195 RMD160 a31d516ba784ad893a740946082fe5e0f15a37ea SHA1 47ab19154084d2b467f09525f5351e9ab7193cf9 SHA256 08c7ec1e76fdd66461b3784d52047f594405f31ba2791ab0c1ec7c97639f5fbd
-EBUILD openslp-1.2.1-r1.ebuild 990 RMD160 6addbff49be886314866f21aedd3604da7bf8b64 SHA1 23c75a29b471c3d6772cd489b3583c21fbc5af10 SHA256 da26ed85830e7d47105d7ff9902ee8bb6571c67beb03528b3e005792ef99ff69
-MD5 3d0b4b764304232f003118a00f694c3f openslp-1.2.1-r1.ebuild 990
-RMD160 6addbff49be886314866f21aedd3604da7bf8b64 openslp-1.2.1-r1.ebuild 990
-SHA256 da26ed85830e7d47105d7ff9902ee8bb6571c67beb03528b3e005792ef99ff69 openslp-1.2.1-r1.ebuild 990
-EBUILD openslp-1.2.1.ebuild 988 RMD160 8fa5822a617b16542119e552ed488365960fbfc4 SHA1 4218b0d0f709ba2ce0de4f8ef76ff5ae81d9bce6 SHA256 aa312cde543505c243a2ea58e1658766c9da80490e707b1e4433a9809ad72c4c
-MD5 28951cf87486384030736d3367e3b7c0 openslp-1.2.1.ebuild 988
-RMD160 8fa5822a617b16542119e552ed488365960fbfc4 openslp-1.2.1.ebuild 988
-SHA256 aa312cde543505c243a2ea58e1658766c9da80490e707b1e4433a9809ad72c4c openslp-1.2.1.ebuild 988
-MISC ChangeLog 5147 RMD160 067ad4b9d267a8f3f6c013fad884defb8de58ab8 SHA1 dea89f35dbf3002f5495bcfabfed9f9f2207e70c SHA256 83a8a7328a49878d436595aac92a3642eb83eec2a87df630952e5139619e1186
-MD5 873d07017d3c7a2c46b4cbaefc068613 ChangeLog 5147
-RMD160 067ad4b9d267a8f3f6c013fad884defb8de58ab8 ChangeLog 5147
-SHA256 83a8a7328a49878d436595aac92a3642eb83eec2a87df630952e5139619e1186 ChangeLog 5147
+DIST openslp-1.3.0.tar.gz 567430 RMD160 0fb5a69f4002bfd504f0f2a4bddbef174c782145 SHA1 a7aba8b86db87030d13dc8c1fe9e98a9adc5814b SHA256 786e5ced948d5fe9f52ef489115e5bdec3c4ec8cc05ae97aeeeca7d393d749a4
+EBUILD openslp-1.2.1-r1.ebuild 1025 RMD160 6cda54b5f0d831138c3abcede80bd50c28bc48e5 SHA1 1028b15b2365c97edd821e1a6e00c357f7d7871c SHA256 688f8d86a469deb0edc673c3d2249f529a63f09c1beeac86fdceca24eb4c320b
+MD5 179a7568dc0d04bfa77d30be8c7ffab5 openslp-1.2.1-r1.ebuild 1025
+RMD160 6cda54b5f0d831138c3abcede80bd50c28bc48e5 openslp-1.2.1-r1.ebuild 1025
+SHA256 688f8d86a469deb0edc673c3d2249f529a63f09c1beeac86fdceca24eb4c320b openslp-1.2.1-r1.ebuild 1025
+EBUILD openslp-1.3.0.ebuild 1012 RMD160 8f304dd0c9b8c6b07a4292f5b51313beaa6c66aa SHA1 946453e97ff5e822ae57196fa3f625e8c761cbde SHA256 0bc77c10d1087d14cd11dad77694b4fd7575cd62707b80851f7de7d6e830c4e6
+MD5 b55ac100231b7f45cd8a3d5ef8cadd68 openslp-1.3.0.ebuild 1012
+RMD160 8f304dd0c9b8c6b07a4292f5b51313beaa6c66aa openslp-1.3.0.ebuild 1012
+SHA256 0bc77c10d1087d14cd11dad77694b4fd7575cd62707b80851f7de7d6e830c4e6 openslp-1.3.0.ebuild 1012
+MISC ChangeLog 5455 RMD160 ba21ff17e5e9e93ea416da821890ca436ccd9c11 SHA1 c7f2aac83f1326ab540c1f1a821bf57e3f77b61c SHA256 6c67e5be41dc96347fffd12c364a06cb88e135ecc1b7a5b5b5ecf1200f029cde
+MD5 e4bbf3224c50074b3f4bb44f0c9cc498 ChangeLog 5455
+RMD160 ba21ff17e5e9e93ea416da821890ca436ccd9c11 ChangeLog 5455
+SHA256 6c67e5be41dc96347fffd12c364a06cb88e135ecc1b7a5b5b5ecf1200f029cde ChangeLog 5455
 MISC metadata.xml 162 RMD160 145aada347c27fc879828b9bb22ff79f4e23325c SHA1 97a164202fb2c7165cdbd9721ea05b4ac2724035 SHA256 753dd90680a9d937cb438cbf14dc217d518514d1596682a4e3478b1b7c7ba051
 MD5 55ae6c8a044782e8066afb018c61bda9 metadata.xml 162
 RMD160 145aada347c27fc879828b9bb22ff79f4e23325c metadata.xml 162
 SHA256 753dd90680a9d937cb438cbf14dc217d518514d1596682a4e3478b1b7c7ba051 metadata.xml 162
-MD5 c4b9599326f444059c5c3efeb0d2eeed files/digest-openslp-1.2.1 241
-RMD160 9ccd6ba8f44d16b32e3b5e14d8423438d3bb55d6 files/digest-openslp-1.2.1 241
-SHA256 47a3261f9d899fa13eecf19cae62227ae9adedd9966d880c6518fa8773b8b60b files/digest-openslp-1.2.1 241
 MD5 c4b9599326f444059c5c3efeb0d2eeed files/digest-openslp-1.2.1-r1 241
 RMD160 9ccd6ba8f44d16b32e3b5e14d8423438d3bb55d6 files/digest-openslp-1.2.1-r1 241
 SHA256 47a3261f9d899fa13eecf19cae62227ae9adedd9966d880c6518fa8773b8b60b files/digest-openslp-1.2.1-r1 241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.6 (GNU/Linux)
-
-iD8DBQFG1sPKyuNVb5qfaOYRAuKhAJ9KLNJZEeA3RuUORIAXdDMrJYd29QCgzShP
-CoWGRba8uoJv7SzAs4OeRnA=
-=V+MJ
------END PGP SIGNATURE-----
+MD5 6af9d742ebf062a1cf49d02aa2ec6ce0 files/digest-openslp-1.3.0 241
+RMD160 d91b75e19cbd83651a5eae8106bf163eeb99bebc files/digest-openslp-1.3.0 241
+SHA256 fe200b6ada8b012ad3c3bed1a38ff8af97564a6957b02761d756cf1fe0d6c18d files/digest-openslp-1.3.0 241
diff --git a/net-libs/openslp/files/digest-openslp-1.2.1 b/net-libs/openslp/files/digest-openslp-1.2.1
deleted file mode 100644
index b6d85969e8fc..000000000000
--- a/net-libs/openslp/files/digest-openslp-1.2.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ff9999d1b44017281dd00ed2c4d32330 openslp-1.2.1.tar.gz 886195
-RMD160 a31d516ba784ad893a740946082fe5e0f15a37ea openslp-1.2.1.tar.gz 886195
-SHA256 08c7ec1e76fdd66461b3784d52047f594405f31ba2791ab0c1ec7c97639f5fbd openslp-1.2.1.tar.gz 886195
diff --git a/net-libs/openslp/files/digest-openslp-1.3.0 b/net-libs/openslp/files/digest-openslp-1.3.0
new file mode 100644
index 000000000000..33831d927a84
--- /dev/null
+++ b/net-libs/openslp/files/digest-openslp-1.3.0
@@ -0,0 +1,3 @@
+MD5 5f89c11ba72c44b5bd296733601027f0 openslp-1.3.0.tar.gz 567430
+RMD160 0fb5a69f4002bfd504f0f2a4bddbef174c782145 openslp-1.3.0.tar.gz 567430
+SHA256 786e5ced948d5fe9f52ef489115e5bdec3c4ec8cc05ae97aeeeca7d393d749a4 openslp-1.3.0.tar.gz 567430
diff --git a/net-libs/openslp/files/openslp-compile_fix.patch b/net-libs/openslp/files/openslp-compile_fix.patch
new file mode 100644
index 000000000000..22bb3d6e2b7c
--- /dev/null
+++ b/net-libs/openslp/files/openslp-compile_fix.patch
@@ -0,0 +1,14 @@
+--- openslp-1.3.0/common/slp_spi.c~	2004-03-04 03:38:49.000000000 +0100
++++ openslp-1.3.0/common/slp_spi.c	2004-03-04 03:38:49.000000000 +0100
+@@ -267,9 +267,9 @@
+     fp = fopen(spifile,"r");
+     if(fp)
+     {
+-        result = xmalloc(sizeof(structSLPSpiHandle));
++        result = xmalloc(sizeof(struct _SLPSpiHandle));
+         if(result == 0) return 0;
+-        memset(result, 0, sizeof(structSLPSpiHandle));
++        memset(result, 0, sizeof(struct _SLPSpiHandle));
+         
+         result->spifile = xstrdup(spifile);
+         result->cacheprivate = cacheprivate;
diff --git a/net-libs/openslp/files/openslp-no_install_doc.patch b/net-libs/openslp/files/openslp-no_install_doc.patch
new file mode 100644
index 000000000000..9f7e3d2ee562
--- /dev/null
+++ b/net-libs/openslp/files/openslp-no_install_doc.patch
@@ -0,0 +1,21 @@
+--- openslp-1.3.0/Makefile.am~	2004-03-04 03:56:37.000000000 +0100
++++ openslp-1.3.0/Makefile.am	2004-03-04 03:56:37.000000000 +0100
+@@ -5,7 +5,6 @@
+ 
+ SUBDIRS	= common libslpattr slpd libslp slptool test
+ EXTRA_DIST = win32 doc etc README.W32 FAQ
+-DOC_DIR = $(prefix)/doc/openslp-$(VERSION)
+ 
+ install-data-local:
+ 	mkdir -p $(DESTDIR)$(sysconfdir)
+@@ -22,10 +21,6 @@
+ 	if [ -f $$file ]; then true;\
+ 	else cp -f $(srcdir)/etc/slp.spi $(DESTDIR)$(sysconfdir);\
+ 	fi
+-	rm -rf $(DESTDIR)$(DOC_DIR)
+-	mkdir -p $(DESTDIR)$(DOC_DIR)
+-	cp -r $(srcdir)/doc/* $(DESTDIR)$(DOC_DIR)
+-#	rm -rf `find $(DESTDIR)$(DOC_DIR) -name CVS`
+ 
+ dist-hook:
+ #	rm -rf `find $(distdir)/doc -name CVS`
diff --git a/net-libs/openslp/files/openslp-opt.patch b/net-libs/openslp/files/openslp-opt.patch
new file mode 100644
index 000000000000..0fe9af3c947d
--- /dev/null
+++ b/net-libs/openslp/files/openslp-opt.patch
@@ -0,0 +1,25 @@
+--- openslp-1.0.11/configure.in.orig	2003-03-11 05:20:05.000000000 +0100
++++ openslp-1.0.11/configure.in	2003-04-18 00:34:27.000000000 +0200
+@@ -120,9 +120,6 @@
+     if test X"$debug" = X"yes"; then
+        CFLAGS="$CFLAGS -Werror"
+     fi
+-    if test X"$debug" = X"no"; then 
+-       OPTFLAGS="-O3"
+-    fi
+     
+ elif $CC -V 2>&1 | grep "WorkShop Compilers"; then
+     dnl Allow C++ style comments
+@@ -161,9 +158,9 @@
+ dnl ***********************************************************************
+ dnl Checks for libraries.
+ dnl ***********************************************************************
+-AC_CHECK_LIB(resolv, inet_aton)
+-AC_CHECK_LIB(socket, main)
+-AC_CHECK_LIB(nsl, gethostbyname)
++AC_SEARCH_LIBS(inet_aton, resolv)
++AC_SEARCH_LIBS(socket, socket)
++AC_SEARCH_LIBS(gethostbyname, nsl)
+ AC_CHECK_LIB(m, main)
+ AC_CHECK_FUNCS(ceil log10 strncasecmp strcasecmp )
+ AC_OUTPUT(Makefile common/Makefile libslpattr/Makefile libslp/Makefile \
diff --git a/net-libs/openslp/openslp-1.2.1-r1.ebuild b/net-libs/openslp/openslp-1.2.1-r1.ebuild
index 1a1dc01d9b53..d8f30e0d5c31 100644
--- a/net-libs/openslp/openslp-1.2.1-r1.ebuild
+++ b/net-libs/openslp/openslp-1.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/openslp/openslp-1.2.1-r1.ebuild,v 1.1 2007/07/13 13:20:28 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openslp/openslp-1.2.1-r1.ebuild,v 1.2 2007/10/14 07:55:57 genstef Exp $
 
 WANT_AUTOMAKE="1.8"
 WANT_AUTOCONF="latest"
@@ -17,7 +17,8 @@ KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc ~sparc-fbs
 IUSE=""
 RESTRICT="test"
 
-DEPEND=""
+DEPEND="dev-libs/openssl"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
diff --git a/net-libs/openslp/openslp-1.2.1.ebuild b/net-libs/openslp/openslp-1.3.0.ebuild
index 042790075103..3e763a110914 100644
--- a/net-libs/openslp/openslp-1.2.1.ebuild
+++ b/net-libs/openslp/openslp-1.3.0.ebuild
@@ -1,9 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/openslp/openslp-1.2.1.ebuild,v 1.18 2007/07/13 13:20:28 uberlord Exp $
-
-WANT_AUTOMAKE="1.8"
-WANT_AUTOCONF="latest"
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openslp/openslp-1.3.0.ebuild,v 1.1 2007/10/14 07:55:57 genstef Exp $
 
 inherit libtool eutils autotools
 
@@ -13,31 +10,28 @@ SRC_URI="mirror://sourceforge/openslp/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 IUSE=""
 RESTRICT="test"
 
-DEPEND=""
+DEPEND="dev-libs/openssl"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}"/${P}-fbsd.patch
-	eautomake
+	epatch "${FILESDIR}"/openslp-compile_fix.patch
+	epatch "${FILESDIR}"/openslp-no_install_doc.patch
+	epatch "${FILESDIR}"/openslp-opt.patch
 
+	eautoreconf
 	elibtoolize
 }
 
-src_compile() {
-	econf || die
-	emake -j1 || die "make failed"
-}
-
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS FAQ ChangeLog NEWS README* THANKS
-	rm -rf "${D}"/usr/doc
-	dohtml -r .
+	dohtml -r doc/*
 	newinitd "${FILESDIR}"/slpd-init slpd
 }