4 files changed, 105 insertions, 10 deletions
diff --git a/app-pda/libopensync/ChangeLog b/app-pda/libopensync/ChangeLog
index 609e8d679ece..53fffaaf5cea 100644
--- a/app-pda/libopensync/ChangeLog
+++ b/app-pda/libopensync/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-pda/libopensync
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync/ChangeLog,v 1.39 2011/02/14 20:14:23 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync/ChangeLog,v 1.40 2011/02/18 06:21:48 dirtyepic Exp $
+
+  18 Feb 2011; Ryan Hill <dirtyepic@gentoo.org> libopensync-0.22-r1.ebuild,
+  +files/libopensync-0.22-Makefile.patch:
+  Prevent relinking against outgoing system libs on downgrade (bug #355291).
 
 *libopensync-0.36-r2 (14 Feb 2011)
 *libopensync-0.22-r1 (14 Feb 2011)
diff --git a/app-pda/libopensync/Manifest b/app-pda/libopensync/Manifest
index 40de8a484942..402b8102f4fb 100644
--- a/app-pda/libopensync/Manifest
+++ b/app-pda/libopensync/Manifest
@@ -1,23 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX libopensync-0.22-Makefile.patch 3321 RMD160 8bd1083ef39f239db6adf8f06e6f5c9b22c96100 SHA1 11cb31036da1e9b1671223d4d873959232a5bedd SHA256 e5bd80cfb8343325677ab737819873c1b73b1114738e1605d886f8668a559346
 AUX libopensync-0.22-fbsd.patch 981 RMD160 32336ef24c3f7c093db6fe550061cba3a2d9baad SHA1 4408b9c05a649e0be8a96505dcaefd4ce52df2f5 SHA256 49089d7e784a5c0f7f2566880db6d266162c1661e35308d6077ea68a23ba78a6
 AUX libopensync-0.22-pythonpath.patch 3311 RMD160 877bd34982a6093c8380b3d4b68f4274609588e0 SHA1 e45b439644877273d4fd88613b3e2a29246e83aa SHA256 a9a8c9870ff27b83df75ff522a17788585b9066d6424a9363c0db0dfff30b702
 AUX libopensync-0.22-swig-typeerror.patch 416 RMD160 d568fdceb7482707a71f83367d18e6c219f11731 SHA1 fbc3422bb56aefd9655961fc98a93fcfeeb3468f SHA256 25aba2f0956b21aab451a5bf471ceb41dda5d2ba2a0ed535a2ecd0ca8ab98f50
 DIST libopensync-0.22.tar.bz2 489978 RMD160 a1e9715d037a7c474b80d609e6c96a24cbb6692f SHA1 47860a8c6621aa89fbff2af2517787747af7cc30 SHA256 3394bae1e3bcfe463d139a367ba5ebe73d968df128c871842dcb4965a725d0dc
 DIST libopensync-0.36.tar.bz2 879868 RMD160 8c4f2b6799c2767e53fc51f17ad95fcfb1e09c70 SHA1 df85159b376427953048134c60872e2bd260a245 SHA256 c686d27f0818e2d8cc6277ba123c74d7210e70fa2b320c5a828eaaedd598e908
 DIST libopensync-0.39.tar.bz2 1146955 RMD160 2124c2d65d75811f021437383f3385df9c954328 SHA1 3d97732675aa874da49cca0f8d6de6f004f2a416 SHA256 078f5d1d29774a190679e7e65e587f34cd8b001f07ea8745f31eba3f07edc430
-EBUILD libopensync-0.22-r1.ebuild 2073 RMD160 a35cc186a9489d3df60eab7e850689a1c17ca226 SHA1 3069f0ac225cbda59a6d203ad0e682e36929cc21 SHA256 a478c01857763f8dd166b58da63a4ebf52487db1df72d24c87a5ba03aed888a1
+EBUILD libopensync-0.22-r1.ebuild 2296 RMD160 6d19c0b7600f41935b8626a3102faf1ea3f80c50 SHA1 78edfa4c96d65155f75294bee4dc9ca42c3d0cc5 SHA256 60794ae5c2b891f34e28fa1ee8994de5a5ca90e37be6961dface09bb381e7178
 EBUILD libopensync-0.22.ebuild 1964 RMD160 bcff66c58e974aef264bb0995edb6f4d47cba465 SHA1 4a0c7af8a6b12d710d37d4e98f1e1a24cc3e4adf SHA256 c87b557e25bbf00f6c6d138625689d2d2206981307fa7efaed8e70c355dc3fac
 EBUILD libopensync-0.36-r2.ebuild 3015 RMD160 374ea5616f5496ef060593e9a04cbb069382654d SHA1 05d163effe471f78f76e2087e7608e1a70ed4a84 SHA256 8a66105ad4b89ffb9ccf6585228889313567371537f7dfc066371ca53206da63
 EBUILD libopensync-0.39-r1.ebuild 3020 RMD160 16c6357c789316fb534053b47abeee74d94445a2 SHA1 57f21b97a6642d6b8242adb3f8e8e146cf872b85 SHA256 e6f8537656ae6e0f70086b6bb095c88a365187d219dff3e5686fbb2c059c28d6
 EBUILD libopensync-9999.ebuild 1661 RMD160 90086aa9f146442d8adf3540fce58b90737d1494 SHA1 63132519184093bf8f46aeaacd3facdf5b8d1372 SHA256 1e12077bb4ea873e81afb438b95cb6cd47615f4804f3c77e0b4a1c6a6a3230ef
-MISC ChangeLog 6680 RMD160 105439aef2a8257a28f3a141c03caa5cecf4904e SHA1 0d2f96694bed439d4f3ac1e80afc8b872d64f25d SHA256 8010f755bdfff1743799e4dba68ffe44e212b1c06eb710dfdedd830f2eea259a
+MISC ChangeLog 6876 RMD160 e6ff4da9293824309188e1067295827bd8fb1d58 SHA1 daf926e8e08afd7cbe5d18a97105addc962670c3 SHA256 c366c3aad86693b2d7269407855b2c05a9a29b1a131b78a8061166c55ef4453b
 MISC metadata.xml 250 RMD160 a93878d09a42447cd57fba806891688212afbd43 SHA1 9425a085c9998e2c0b7783326661ebcbf0858e7c SHA256 be46db170c8eab4c5319615306d2df7bb79fe3c7b3a37c191573846cb24b16b7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk1ZjoMACgkQiqiDRvmkBmIEMACg8B2Cr6Y1s8AmOLH5EaLuMmlq
-f98AoL40rbFOICcsFOf/WYt/q5IUzrKW
-=aXx9
+iEYEARECAAYFAk1eEWEACgkQiqiDRvmkBmKxWgCg5DRnpJwstZ8pq2zEMGmC9veF
+1jUAnjJg8xe5nmHqrPMj/yPMl00/0T6t
+=6pQJ
 -----END PGP SIGNATURE-----
diff --git a/app-pda/libopensync/files/libopensync-0.22-Makefile.patch b/app-pda/libopensync/files/libopensync-0.22-Makefile.patch
new file mode 100644
index 000000000000..579b792a49d4
--- /dev/null
+++ b/app-pda/libopensync/files/libopensync-0.22-Makefile.patch
@@ -0,0 +1,82 @@
+https://bugs.gentoo.org/355291
+
+--- a/opensync/Makefile.am
++++ b/opensync/Makefile.am
+@@ -77,5 +77,5 @@ CLEANFILES = \
+ 	*.bbg \
+ 	*.da
+ 
+-libopensync_la_LDFLAGS = @PACKAGE_LIBS@ @GCOV_LDFLAGS@
+-libopensync_la_LIBADD = @XML_LIBS@
++libopensync_la_LDFLAGS = @GCOV_LDFLAGS@
++libopensync_la_LIBADD = @PACKAGE_LIBS@ @XML_LIBS@
+--- a/osengine/Makefile.am
++++ b/osengine/Makefile.am
+@@ -43,5 +43,5 @@ CLEANFILES = \
+ 	*.bbg \
+ 	*.da
+ 
+-libosengine_la_LDFLAGS = $(PACKAGE_LIBS) -R $(libdir) @GCOV_LDFLAGS@
+-libosengine_la_LIBADD = $(top_builddir)/opensync/libopensync.la
++libosengine_la_LDFLAGS = @GCOV_LDFLAGS@
++libosengine_la_LIBADD = $(top_builddir)/opensync/libopensync.la $(PACKAGE_LIBS)
+--- a/osplugin/Makefile.am
++++ b/osplugin/Makefile.am
+@@ -9,8 +9,8 @@ libexec_PROGRAMS = osplugin
+ ospluginincludedir = @OPENSYNC_HEADERDIR@
+ 
+ osplugin_SOURCES = osplugin.c
+-osplugin_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
+-osplugin_LDADD = $(top_builddir)/opensync/libopensync.la
++osplugin_LDFLAGS = @GCOV_LDFLAGS@
++osplugin_LDADD = $(top_builddir)/opensync/libopensync.la @PACKAGE_LIBS@ @XML_LIBS@
+ 
+ CLEANFILES = \
+ 	*.bb \
+--- a/tools/Makefile.am
++++ b/tools/Makefile.am
+@@ -9,24 +9,24 @@ bin_PROGRAMS = osyncdump osyncstress osyncplugin osynctest osyncbinary
+ endif
+ 
+ osyncdump_SOURCES = osyncdump.c
+-osyncdump_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
+-osyncdump_LDADD = $(top_builddir)/opensync/libopensync.la
++osyncdump_LDFLAGS = @GCOV_LDFLAGS@
++osyncdump_LDADD = $(top_builddir)/opensync/libopensync.la @PACKAGE_LIBS@ @XML_LIBS@
+ 
+ osyncstress_SOURCES = osyncstress.c
+-osyncstress_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
+-osyncstress_LDADD = $(top_builddir)/osengine/libosengine.la $(top_builddir)/opensync/libopensync.la
++osyncstress_LDFLAGS = @GCOV_LDFLAGS@
++osyncstress_LDADD = $(top_builddir)/osengine/libosengine.la $(top_builddir)/opensync/libopensync.la @PACKAGE_LIBS@
+ 
+ osyncplugin_SOURCES = osyncplugin.c
+-osyncplugin_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
+-osyncplugin_LDADD = $(top_builddir)/opensync/libopensync.la
++osyncplugin_LDFLAGS = @GCOV_LDFLAGS@
++osyncplugin_LDADD = $(top_builddir)/opensync/libopensync.la @PACKAGE_LIBS@
+ 
+ osynctest_SOURCES = osynctest.c
+-osynctest_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
+-osynctest_LDADD = $(top_builddir)/osengine/libosengine.la $(top_builddir)/opensync/libopensync.la
++osynctest_LDFLAGS = @GCOV_LDFLAGS@
++osynctest_LDADD = $(top_builddir)/osengine/libosengine.la $(top_builddir)/opensync/libopensync.la @PACKAGE_LIBS@
+ 
+ osyncbinary_SOURCES = osyncbinary.c
+-osyncbinary_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir)
+-osyncbinary_LDADD = $(top_builddir)/opensync/libopensync.la
++osyncbinary_LDFLAGS =
++osyncbinary_LDADD = $(top_builddir)/opensync/libopensync.la @PACKAGE_LIBS@
+ 
+ CLEANFILES = \
+ 	*.bb \
+--- a/wrapper/Makefile.am
++++ b/wrapper/Makefile.am
+@@ -22,5 +22,5 @@ osbindings_LTLIBRARIES = _opensync.la
+ endif
+ 
+ nodist__opensync_la_SOURCES = opensync_wrap.c
+-_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -R $(libdir) -module -avoid-version
+-_opensync_la_LIBADD = $(top_builddir)/opensync/libopensync.la
++_opensync_la_LDFLAGS = -module -avoid-version
++_opensync_la_LIBADD = $(top_builddir)/opensync/libopensync.la $(PYTHON_LDFLAGS) @PACKAGE_LIBS@ @XML_LIBS@
diff --git a/app-pda/libopensync/libopensync-0.22-r1.ebuild b/app-pda/libopensync/libopensync-0.22-r1.ebuild
index 4897c74423ce..2a2022a28939 100644
--- a/app-pda/libopensync/libopensync-0.22-r1.ebuild
+++ b/app-pda/libopensync/libopensync-0.22-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync/libopensync-0.22-r1.ebuild,v 1.1 2011/02/14 20:14:23 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync/libopensync-0.22-r1.ebuild,v 1.2 2011/02/18 06:21:48 dirtyepic Exp $
 
 EAPI="3"
 
@@ -36,8 +36,11 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-fbsd.patch
 	epatch "${FILESDIR}"/${P}-pythonpath.patch
 	epatch "${FILESDIR}"/${P}-swig-typeerror.patch
-	eautoreconf # for pythonpath
-	find "${S}" -name Makefile.in -print0 | xargs -0 sed -i -e 's: -Werror::'
+	epatch "${FILESDIR}"/${P}-Makefile.patch
+	eautoreconf
+
+	find "${S}" -name Makefile.in -print0 | xargs -0 sed -i -e 's: -Werror::' \
+		-e 's: -R $(libdir)::g'
 
 	use python && python_copy_sources
 }
@@ -51,10 +54,15 @@ src_configure() {
 			$(use_enable debug) \
 			$(use_enable debug tracing)
 			#$(use_enable test unit-tests)
+
+			sed -i -e 's:^\(hardcode_libdir_flag_spec=\).*:\1"":g' \
+				-e 's:^\(runpath_var=\).*:\1DIE_RPATH_DIE:g' \
+				-e 's:func_apped:func_append:g' \
+				libtool
 	}
 
 	use python && python_execute_function -s do_configure
-	do_configure # do even when USE=python to generate Doxyfile in ${S}
+	do_configure # do this even when USE=python - we need to generate Doxyfile
 }
 
 src_compile() {