fix bug 82961

Package-Manager: portage-2.1_pre3-r1

4 files changed, 11 insertions, 73 deletions

diff --git a/dev-libs/openobex/ChangeLog b/dev-libs/openobex/ChangeLog
index 77705a2f1375..6aa2744897b5 100644
--- a/dev-libs/openobex/ChangeLog
+++ b/dev-libs/openobex/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/openobex
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openobex/ChangeLog,v 1.25 2006/01/19 18:35:51 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openobex/ChangeLog,v 1.26 2006/01/26 14:29:45 blubb Exp $
+
+  26 Jan 2006; Simon Stelling <blubb@gentoo.org>
+  -files/openobex-1.0.1-shared-object.patch, openobex-1.0.1.ebuild:
+  fix bug 82961
 
   19 Jan 2006; Alin Nastac <mrness@gentoo.org> openobex-1.0.0.ebuild,
   openobex-1.0.1.ebuild:
diff --git a/dev-libs/openobex/Manifest b/dev-libs/openobex/Manifest
index e29729b5d668..346ffb1fadef 100644
--- a/dev-libs/openobex/Manifest
+++ b/dev-libs/openobex/Manifest
@@ -1,17 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 032c435e7cc2a88534acf6a50bd7ca24 ChangeLog 2795
+MD5 6c726059a2e3c5cfdf4597f6027cb50d ChangeLog 2928
 MD5 165cdde955fa7f445d03005d25665e20 files/digest-openobex-1.0.0 66
 MD5 a577e794f16a7f437408fcbd5861b9ed files/digest-openobex-1.0.1 66
-MD5 5d15b9110d8811e635f436f52ee24e48 files/openobex-1.0.1-shared-object.patch 1920
 MD5 04575f2be24f9d061c624e41b93d0394 metadata.xml 414
 MD5 aaf22cbbc6d71ac9d9475ce10b34ed74 openobex-1.0.0.ebuild 615
-MD5 675f5e30b518bbe2b5c85d0d27876c07 openobex-1.0.1.ebuild 975
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDz9wVjG8pv1lIUX4RAjxXAJ9FUzVK6mEzGmWCX1pF1Z+KkYhWlQCgyj76
-ME03pC2Scu15lM25fnymEf4=
-=LFDA
------END PGP SIGNATURE-----
+MD5 a0212a8fd7ef821126d2093612d7e10f openobex-1.0.1.ebuild 911
diff --git a/dev-libs/openobex/files/openobex-1.0.1-shared-object.patch b/dev-libs/openobex/files/openobex-1.0.1-shared-object.patch
deleted file mode 100644
index b5e23410083c..000000000000
--- a/dev-libs/openobex/files/openobex-1.0.1-shared-object.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- src/Makefile.in.orig	2004-07-03 17:49:53.351333976 +0200
-+++ src/Makefile.in	2004-07-03 17:51:00.034196640 +0200
-@@ -90,7 +90,7 @@
- 
- include_HEADERS = obex.h obex_const.h
- 
--lib_LTLIBRARIES = libopenobex.la
-+lib_LTLIBRARIES = libopenobex.la libopenobex.so
- 
- libopenobex_la_SOURCES =  	obex.c 	obex_main.c obex_main.h 	obex_connect.c obex_connect.h 	obex_header.c obex_header.h 	obex_object.c obex_object.h 	obex_transport.c obex_transport.h 	obex_server.c obex_server.h 	obex_client.c obex_client.h 	irobex.c irobex.h 	inobex.c inobex.h 	btobex.c btobex.h 	netbuf.c netbuf.h 	irda.h irda_wrap.h
- 
-@@ -132,7 +132,7 @@
- SOURCES = $(libopenobex_la_SOURCES)
- OBJECTS = $(libopenobex_la_OBJECTS)
- 
--all: all-redirect
-+all: shared-dir all-redirect
- .SUFFIXES:
- .SUFFIXES: .S .c .lo .o .obj .s
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-@@ -142,6 +142,8 @@
- 	cd $(top_builddir) \
- 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
- 
-+shared-dir:
-+	mkdir -p shared
- 
- mostlyclean-libLTLIBRARIES:
- 
-@@ -170,6 +172,7 @@
- 
- .c.o:
- 	$(COMPILE) -c $<
-+	$(COMPILE) -fPIC -o shared/$(basename $<).o -c $<
- 
- # FIXME: We should only use cygpath when building on Windows,
- # and only if it is available.
-@@ -195,6 +198,7 @@
- 
- .c.lo:
- 	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+	$(LIBTOOL) --mode=compile $(COMPILE) -fPIC -o shared/$(basename $<).lo -c $<
- 
- .s.lo:
- 	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-@@ -215,6 +219,9 @@
- libopenobex.la: $(libopenobex_la_OBJECTS) $(libopenobex_la_DEPENDENCIES)
- 	$(LINK) -rpath $(libdir) $(libopenobex_la_LDFLAGS) $(libopenobex_la_OBJECTS) $(libopenobex_la_LIBADD) $(LIBS)
- 
-+libopenobex.so:
-+	$(LINK) -rpath $(libdir) -shared -Wl,-shared,-soname,libopenobex.so -o libopenobex.so $(libopenobex_la_LDFLAGS) shared/*.o
-+
- install-includeHEADERS: $(include_HEADERS)
- 	@$(NORMAL_INSTALL)
- 	$(mkinstalldirs) $(DESTDIR)$(includedir)
diff --git a/dev-libs/openobex/openobex-1.0.1.ebuild b/dev-libs/openobex/openobex-1.0.1.ebuild
index 94a0378b2877..2a4a55aa7ef1 100644
--- a/dev-libs/openobex/openobex-1.0.1.ebuild
+++ b/dev-libs/openobex/openobex-1.0.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openobex/openobex-1.0.1.ebuild,v 1.19 2006/01/19 18:35:51 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openobex/openobex-1.0.1.ebuild,v 1.20 2006/01/26 14:29:45 blubb Exp $
 
-inherit eutils gnuconfig
+inherit gnuconfig
 
 IUSE=""
 
@@ -16,12 +16,12 @@ HOMEPAGE="http://sourceforge.net/projects/openobex"
 
 SLOT="0"
 LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="-amd64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~amd64 hppa ppc ppc64 sparc x86"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	use amd64 && epatch ${FILESDIR}/${P}-shared-object.patch
+	
 	gnuconfig_update
 }