# HG changeset patch
# User Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
# Date 2010-03-15 21:37:16
# Node ID f40ae73525066e33d88f0e7224435f6339e86774
# Parent  4706d9c49caf1dcbb139589faca2a65d76b25ee4

Fix up ebuilds to build libraries using libtool, use EAPI="2", and fix QA issues. Bug 309681, bug 308373, and for portage-multilib.
(Portage version: 2.2_rc67-r2/hg/Linux x86_64)
 (Signed Manifest commit)

diff --git a/media-plugins/live/ChangeLog b/media-plugins/live/ChangeLog
--- a/media-plugins/live/ChangeLog
+++ b/media-plugins/live/ChangeLog
@@ -2,6 +2,19 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/media-plugins/live/ChangeLog,v 1.126 2010/01/06 16:55:17 ranger Exp $
 
+  16 Mar 2010; Nathan Phillip Brink (ohnobinki)
+  <ohnobinki@ohnopublishing.net> -live-2008.09.02.ebuild,
+  live-2009.06.02.ebuild, +files/live-2009.06.02-as-needed.patch,
+  +files/live-2009.06.02-buildorder.patch,
+  +files/live-2009.06.02-libdeps.patch, live-2009.09.28.ebuild,
+  +files/live-2009.09.28-buildorder.patch, live-2009.11.12.ebuild,
+  files/config.gentoo, -files/config.gentoo-so, -files/config.gentoo-so-r1,
+  files/live-recursive.patch:
+  Fix up ebuilds to build libraries using libtool instead of by calling ld
+  directly. Also upgraded to EAPI="2", shorten DESCRIPTION, and added some
+  missing die''s. All for bug 309681, bug 308373, and to properly support
+  portage-multilib.
+
   06 Jan 2010; Brent Baude <ranger@gentoo.org> live-2009.06.02.ebuild:
   Marking live-2009.06.02 ppc64 for bug 277009
 
diff --git a/media-plugins/live/Manifest b/media-plugins/live/Manifest
--- a/media-plugins/live/Manifest
+++ b/media-plugins/live/Manifest
@@ -1,14 +1,24 @@
-AUX config.gentoo 480 RMD160 7fe83cf6a587076b282c66f4e4d730e41b55fc27 SHA1 c26ee14495ac18d25aff20290b55181fa9245082 SHA256 f8dfcb44221ab3e1fbea958b0be5d817aaebe971129def44a96fe1cb0a7d4a00
-AUX config.gentoo-so 504 RMD160 60475939b963301f3a26416d87e53f8b08668d3e SHA1 9b829c9fe7c3a1f64a77deb5d484361c8ff8cd60 SHA256 48e623d25c0697e3274355670eae2d0d7f590502f63652bc3cf6cadbdd5429e2
-AUX config.gentoo-so-r1 505 RMD160 6bd37a2fa790eb116c477a6c77f61e88a3535348 SHA1 99961d3665c05375750c076e5f6bffc4044fdc42 SHA256 be1d556e414d128ee3998b4ad640dcd2fb829430c134997134e7054edac55eaf
-AUX live-recursive.patch 401 RMD160 512ee0cf4ca9139af5451be8bf7aa4321997cb03 SHA1 df84e25e5f879d93be4a71ec57c090f0d2c80f4f SHA256 353e9d709ae60a216069d39880ae1781e2037692c77ea5aca60dfb0ca1b2ae88
-DIST live.2008.09.02.tar.gz 449719 RMD160 003e1aa2ee94a4e1629520aeab34f343b08ec562 SHA1 ea65e82fa331dd843af75d2eb35f23cd07308062 SHA256 c653c494972f5cda360116ea162249e0a1784980e35258e6950d469d0deaf146
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX config.gentoo 883 RMD160 7e6abf65cc60bbd409d4b10004eeb66dc91fa019 SHA1 0c1c2394d75f2a6beb3c7c540df96d4720232510 SHA256 6d5b8f14b5ede4e04835730fe9ffc6246774c7cb10891cbb6337f567eff4f079
+AUX live-2009.06.02-as-needed.patch 2046 RMD160 0b3d76de9a4e3204270f9a6d302f30dfaa35e231 SHA1 c123bf94e44e1956586038e98b54b66fad42e129 SHA256 91a6686066fb66d191ae715b30e21b1df26546cd07aa3a4ce3280521a90739da
+AUX live-2009.06.02-buildorder.patch 924 RMD160 a9a6a7a364b21b43859e35e6e023715bb0fad7dd SHA1 f86fa92a48572bb89b4a6a38c6aed4edd4d098de SHA256 59a91ecbbcdda7f62f7150962490333bbb67e2ee838ff9c6e334dd5d0ab20813
+AUX live-2009.06.02-libdeps.patch 2803 RMD160 37d3e1479e742e73d9694678f0c2628ece430725 SHA1 1c8f0ae1092bf57d322361c168e70d60bafd0442 SHA256 ba29f92495d18c0620fbda9d3797cf5871fb22443a242f982a854b892a309903
+AUX live-2009.09.28-buildorder.patch 1060 RMD160 cd6a6c2e699eaae0c5b5a40959c988ed3e74745a SHA1 5fdeea464948f31dcb4a6948394f74b67e502428 SHA256 f280a8cade00530cdd009cf1f999df6ff0d5f6c53cae78e12e84a8dc6461b2aa
+AUX live-recursive.patch 433 RMD160 f70734114f7423f48693f71c5b0f0ae85c337090 SHA1 87526904f6e69696f6fbf41a2313f1a43c51871a SHA256 6347a54046cf02671666bf74a3dbb54ebb898adafe9670abecebe86e6d870288
 DIST live.2009.06.02.tar.gz 469471 RMD160 ddbe057ac4f47d66ee7c99ec3c4886fe97f06565 SHA1 a03ac47dc1b2a5e4745e30fc304af61675036782 SHA256 66c54241bfcc7ea42fe40e1c93739be79a3c065390c4163c0f2647ac45c24758
 DIST live.2009.09.28.tar.gz 449508 RMD160 c25cb1a2377f0fe6c3817bbc3edbcd4daa57d0dc SHA1 e5657206976f592e3fd1fda9cfe77b5712498784 SHA256 0e84700e8982ac5472723c0327131c179512d4b99fe0c4ae903cfe08a1a0e03c
 DIST live.2009.11.12.tar.gz 449650 RMD160 ef21d2b72aaf2044c9e96cadfe62cc1304d89843 SHA1 14830984d85ef710835d5e9c26ebb626b66c0260 SHA256 f6ee9c1079b5ab8e330c9edd7634bcffd76eb434cf52fe2ea06c4072bf823645
-EBUILD live-2008.09.02.ebuild 2689 RMD160 af10c27f30637a41ef15c6aafb7efd2789e61a3b SHA1 ca53be474c41399e7a5cb6ee10b26bdfaac7d9b9 SHA256 db9ffbfb365b91be08e6719a26094f7d7b2fc3d415a3fd9846e5b6504d19e08d
-EBUILD live-2009.06.02.ebuild 2688 RMD160 907541e56cae9099300647e741448aa51895c1ba SHA1 81899e914a1cbf97cdc0a205e8741184f0fae397 SHA256 2eb82ec8978f19a3b1ec68c66494a15c924dbad9700ce718e4407a006950b0ff
-EBUILD live-2009.09.28.ebuild 2675 RMD160 99bdca5624bda0a83cf1b75c4e322e673bcfcb7f SHA1 8e9f969c6c73a48645814d2c6a5e09224eccb64a SHA256 4467e23341bf8500af2b133e24bab748717fbdbd5cd67a7126c3a7accbcd66d1
-EBUILD live-2009.11.12.ebuild 2675 RMD160 e3daeca1bc6032591e2684efa1756e316a024174 SHA1 f00b56e94294cefa4eeae46a36d8b609a434831c SHA256 dfa24684732286dc625585e51865876aa3101d5718fb6ef0c2e9b9c1bc62a107
-MISC ChangeLog 15724 RMD160 a28d414b11ee4b9f1058d349d70c855b8fcbb430 SHA1 bc5a61816267a90227af3979baf20c0d16f0702b SHA256 4215268abb9e6c055d7d1cbf603ea83ccd03c2733fd5ea95fbdb15b6867d3e83
+EBUILD live-2009.06.02.ebuild 2547 RMD160 0f43b19c53d4c6be7f4643a961ba32a83a7ede5d SHA1 88e01d0a3498a6439249270deb4d642ab8cb4737 SHA256 8cbd9d36063f2acfe7728bcc2ad4dd8112b4fd9993caf60e03547fea0ab88bc3
+EBUILD live-2009.09.28.ebuild 2534 RMD160 94e6c28e16926040e2295d4cfe51dd5a4bcba4bd SHA1 cb13c5ccdf07cac07f8bafb4a91d033e136bee6e SHA256 bebe47d33036bf28d89fd3a5c365eb76aa8885e738a7af02320c8bca98cf2f8c
+EBUILD live-2009.11.12.ebuild 2513 RMD160 c1293171f7798ab32aa03a7fe63ed45540af8d5c SHA1 5c47796e9e96223f0079aec84df38237394c6b9d SHA256 ffcb29f699392b4a1d5ce0d82c5615d346dd8cfece0e0171391e23881ef1b933
+MISC ChangeLog 16421 RMD160 16df49dd4d6ba6d1ebc160ed339b06037e4e8d91 SHA1 698b802518240723da8cf87f8025805651f1ec9f SHA256 e1e3259e368500afd107cb6cfee3e83114c2c2dbe7170a03eae5c036684b4362
 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkue4MsACgkQni8M22OVw8CNIQCfSRgGQyVI6Dbr4kQhULz5dSkU
+bFoAoIYS6lvkvB/CpsBQ8NUtF2ZUVHD0
+=6Air
+-----END PGP SIGNATURE-----
diff --git a/media-plugins/live/files/config.gentoo b/media-plugins/live/files/config.gentoo
--- a/media-plugins/live/files/config.gentoo
+++ b/media-plugins/live/files/config.gentoo
@@ -1,17 +1,25 @@
+LIBTOOL_WRAPPER =	libtool --tag=CXX
 COMPILE_OPTS =		$(INCLUDES) -I. -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
 C =			c
-C_COMPILER =		$(CC)
+C_COMPILER =		$(LIBTOOL_WRAPPER) --mode=compile $(CC)
 C_FLAGS =		$(COMPILE_OPTS) $(CFLAGS)
 CPP =			cpp
-CPLUSPLUS_COMPILER =	$(CXX)
+CPLUSPLUS_COMPILER =	$(LIBTOOL_WRAPPER) --mode=compile $(CXX)
 CPLUSPLUS_FLAGS =	$(COMPILE_OPTS) $(CXXFLAGS)
-OBJ =			o
-LINK =			$(CXX) -o
-LINK_OPTS =		-L.
+OBJ =			lo
+LINK =			$(LIBTOOL_WRAPPER) --mode=link $(CXX) -o 
+LINK_OPTS =		$(CXXFLAGS) $(LDFLAGS)
 CONSOLE_LINK_OPTS =	$(LINK_OPTS)
-LIBRARY_LINK =		$(LD) -o
-LIBRARY_LINK_OPTS =	$(LINK_OPTS) -r -Bstatic
-LIB_SUFFIX =			a
+LIBRARY_LINK =		$(LIBTOOL_WRAPPER) --mode=link $(CXX) -version-info $(LIVE_ABI_VERSION) -rpath $(LIBDIR) -o 
+LIBRARY_LINK_OPTS =	$(LINK_OPTS)
+LIB_SUFFIX =		la
 LIBS_FOR_CONSOLE_APPLICATION =
 LIBS_FOR_GUI_APPLICATION =
 EXE =
+INSTALL =		install -c 
+
+# rules for libtool's lo files
+%.$(OBJ) : %.$(C)
+	 $(C_COMPILER) -c $(C_FLAGS) $<
+%.$(OBJ) : %.$(CPP)
+	 $(CPLUSPLUS_COMPILER) -c $(CPLUSPLUS_FLAGS) $<
diff --git a/media-plugins/live/files/config.gentoo-so b/media-plugins/live/files/config.gentoo-so
deleted file mode 100644
--- a/media-plugins/live/files/config.gentoo-so
+++ /dev/null
@@ -1,17 +0,0 @@
-COMPILE_OPTS =		$(INCLUDES) -I. -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
-C =			c
-C_COMPILER =		$(CC)
-C_FLAGS =		$(COMPILE_OPTS) -fPIC $(CFLAGS)
-CPP =			cpp
-CPLUSPLUS_COMPILER =	$(CXX)
-CPLUSPLUS_FLAGS =	$(COMPILE_OPTS) -fPIC $(CXXFLAGS)
-OBJ =			o
-LINK =			$(CXX) -o
-LINK_OPTS =		-L.
-CONSOLE_LINK_OPTS =	$(LINK_OPTS)
-LIBRARY_LINK =		$(CC) -o
-LIBRARY_LINK_OPTS =	$(LINK_OPTS) -shared -Wl,-soname,$@
-LIB_SUFFIX =			so
-LIBS_FOR_CONSOLE_APPLICATION =
-LIBS_FOR_GUI_APPLICATION =
-EXE =
diff --git a/media-plugins/live/files/config.gentoo-so-r1 b/media-plugins/live/files/config.gentoo-so-r1
deleted file mode 100644
--- a/media-plugins/live/files/config.gentoo-so-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-COMPILE_OPTS =		$(INCLUDES) -I. -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
-C =			c
-C_COMPILER =		$(CC)
-C_FLAGS =		$(COMPILE_OPTS) -fPIC $(CFLAGS)
-CPP =			cpp
-CPLUSPLUS_COMPILER =	$(CXX)
-CPLUSPLUS_FLAGS =	$(COMPILE_OPTS) -fPIC $(CXXFLAGS)
-OBJ =			o
-LINK =			$(CXX) -o
-LINK_OPTS =		-L.
-CONSOLE_LINK_OPTS =	$(LINK_OPTS)
-LIBRARY_LINK =		$(CXX) -o
-LIBRARY_LINK_OPTS =	$(LINK_OPTS) -shared -Wl,-soname,$@
-LIB_SUFFIX =			so
-LIBS_FOR_CONSOLE_APPLICATION =
-LIBS_FOR_GUI_APPLICATION =
-EXE =
diff --git a/media-plugins/live/files/live-2009.06.02-as-needed.patch b/media-plugins/live/files/live-2009.06.02-as-needed.patch
new file mode 100644
--- /dev/null
+++ b/media-plugins/live/files/live-2009.06.02-as-needed.patch
@@ -0,0 +1,42 @@
+Author: Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
+Purpose: To fix compilation error when using LDFLAGS=-Wl,--as-needed
+Uselessness: Not needed as of live-2009.09.28.
+
+--- a/testProgs/Makefile.tail	2010-03-08 20:37:16.000000000 -0500
++++ b/testProgs/Makefile.tail	2010-03-08 20:37:27.000000000 -0500
+@@ -59,7 +59,7 @@
+ GROUPSOCK_DIR = ../groupsock
+ GROUPSOCK_LIB = $(GROUPSOCK_DIR)/libgroupsock.$(LIB_SUFFIX)
+ LOCAL_LIBS =	$(LIVEMEDIA_LIB) $(GROUPSOCK_LIB) \
+-		$(USAGE_ENVIRONMENT_LIB) $(BASIC_USAGE_ENVIRONMENT_LIB)
++		$(BASIC_USAGE_ENVIRONMENT_LIB) $(USAGE_ENVIRONMENT_LIB)
+ LIBS =			$(LOCAL_LIBS) $(LIBS_FOR_CONSOLE_APPLICATION)
+ 
+ testMP3Streamer$(EXE):	$(MP3_STREAMER_OBJS) $(LOCAL_LIBS)
+
+Diff finished.  Mon Mar  8 20:37:27 2010
+--- a/mediaServer/Makefile.tail	2009-06-02 05:03:18.000000000 -0400
++++ b/mediaServer/Makefile.tail	2010-03-08 20:45:35.000000000 -0500
+@@ -25,7 +25,7 @@
+ GROUPSOCK_DIR = ../groupsock
+ GROUPSOCK_LIB = $(GROUPSOCK_DIR)/libgroupsock.$(LIB_SUFFIX)
+ LOCAL_LIBS =	$(LIVEMEDIA_LIB) $(GROUPSOCK_LIB) \
+-		$(USAGE_ENVIRONMENT_LIB) $(BASIC_USAGE_ENVIRONMENT_LIB)
++		$(BASIC_USAGE_ENVIRONMENT_LIB) $(USAGE_ENVIRONMENT_LIB)
+ LIBS =			$(LOCAL_LIBS) $(LIBS_FOR_CONSOLE_APPLICATION)
+ 
+ live555MediaServer$(EXE):	$(MEDIA_SERVER_OBJS) $(LOCAL_LIBS)
+--- a/Makefile.tail	2009-06-02 05:03:18.000000000 -0400
++++ b/Makefile.tail	2010-03-08 20:48:23.000000000 -0500
+@@ -32,9 +32,9 @@
+ 	cd $(USAGE_ENVIRONMENT_DIR) ; $(MAKE)
+ $(BASIC_USAGE_ENVIRONMENT_LIB):
+ 	cd $(BASIC_USAGE_ENVIRONMENT_DIR) ; $(MAKE)
+-$(TESTPROGS_APP): $(LIVEMEDIA_LIB) $(GROUPSOCK_LIB) $(USAGE_ENVIRONMENT_LIB) $(BASIC_USAGE_ENVIRONMENT_LIB)
++$(TESTPROGS_APP): $(LIVEMEDIA_LIB) $(GROUPSOCK_LIB) $(BASIC_USAGE_ENVIRONMENT_LIB) $(USAGE_ENVIRONMENT_LIB)
+ 	cd $(TESTPROGS_DIR) ; $(MAKE)
+-$(MEDIA_SERVER_APP): $(LIVEMEDIA_LIB) $(GROUPSOCK_LIB) $(USAGE_ENVIRONMENT_LIB) $(BASIC_USAGE_ENVIRONMENT_LIB)
++$(MEDIA_SERVER_APP): $(LIVEMEDIA_LIB) $(GROUPSOCK_LIB) $(BASIC_USAGE_ENVIRONMENT_LIB) $(USAGE_ENVIRONMENT_LIB)
+ 	cd $(MEDIA_SERVER_DIR) ; $(MAKE)
+ 
+ clean:
diff --git a/media-plugins/live/files/live-2009.06.02-buildorder.patch b/media-plugins/live/files/live-2009.06.02-buildorder.patch
new file mode 100644
--- /dev/null
+++ b/media-plugins/live/files/live-2009.06.02-buildorder.patch
@@ -0,0 +1,24 @@
+Author: Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
+Purpose: To help get libtool working with live.
+
+diff -r a467df21e246 -r d1fda89b91cd Makefile.tail
+--- a/Makefile.tail	Fri Mar 12 11:30:13 2010 -0500
++++ b/Makefile.tail	Fri Mar 12 12:19:11 2010 -0500
+@@ -24,13 +24,13 @@
+ all:	$(ALL)
+ 
+ 
+-$(LIVEMEDIA_LIB):
++$(LIVEMEDIA_LIB): $(GROUPSOCK_LIB) $(BASIC_USAGE_ENVIRONMENT_LIB)
+ 	cd $(LIVEMEDIA_DIR) ; $(MAKE)
+-$(GROUPSOCK_LIB):
++$(GROUPSOCK_LIB): $(BASIC_USAGE_ENVIRONMENT_LIB)
+ 	cd $(GROUPSOCK_DIR) ; $(MAKE)
+ $(USAGE_ENVIRONMENT_LIB):
+ 	cd $(USAGE_ENVIRONMENT_DIR) ; $(MAKE)
+-$(BASIC_USAGE_ENVIRONMENT_LIB):
++$(BASIC_USAGE_ENVIRONMENT_LIB): $(USAGE_ENVIRONMENT_LIB)
+ 	cd $(BASIC_USAGE_ENVIRONMENT_DIR) ; $(MAKE)
+ $(TESTPROGS_APP): $(LIVEMEDIA_LIB) $(GROUPSOCK_LIB) $(BASIC_USAGE_ENVIRONMENT_LIB) $(USAGE_ENVIRONMENT_LIB)
+ 	cd $(TESTPROGS_DIR) ; $(MAKE)
+diff -r a467df21e246 -r d1fda89b91cd groupsock/Makefile.tail
diff --git a/media-plugins/live/files/live-2009.06.02-libdeps.patch b/media-plugins/live/files/live-2009.06.02-libdeps.patch
new file mode 100644
--- /dev/null
+++ b/media-plugins/live/files/live-2009.06.02-libdeps.patch
@@ -0,0 +1,60 @@
+Author: Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
+Purpose: To help get libtool working with live.
+
+diff -r a467df21e246 -r d1fda89b91cd BasicUsageEnvironment/Makefile.tail
+--- a/BasicUsageEnvironment/Makefile.tail	Fri Mar 12 11:30:13 2010 -0500
++++ b/BasicUsageEnvironment/Makefile.tail	Fri Mar 12 12:19:11 2010 -0500
+@@ -7,10 +7,11 @@
+ OBJS = BasicUsageEnvironment0.$(OBJ) BasicUsageEnvironment.$(OBJ) \
+ 	BasicTaskScheduler0.$(OBJ) BasicTaskScheduler.$(OBJ) \
+ 	DelayQueue.$(OBJ) BasicHashTable.$(OBJ)
++LIBS = ../UsageEnvironment/libUsageEnvironment.$(LIB_SUFFIX)
+ 
+ libBasicUsageEnvironment.$(LIB_SUFFIX): $(OBJS)
+ 	$(LIBRARY_LINK)$@ $(LIBRARY_LINK_OPTS) \
+-		$(OBJS)
++		$(OBJS) $(LIBS)
+ 
+ .$(C).$(OBJ):
+ 	$(C_COMPILER) -c $(C_FLAGS) $<       
+diff -r a467df21e246 -r d1fda89b91cd groupsock/Makefile.tail
+--- a/groupsock/Makefile.tail	Fri Mar 12 11:30:13 2010 -0500
++++ b/groupsock/Makefile.tail	Fri Mar 12 12:19:11 2010 -0500
+@@ -10,6 +10,7 @@
+ 	$(CPLUSPLUS_COMPILER) -c $(CPLUSPLUS_FLAGS) $<
+ 
+ GROUPSOCK_LIB_OBJS = GroupsockHelper.$(OBJ) GroupEId.$(OBJ) inet.$(OBJ) Groupsock.$(OBJ) NetInterface.$(OBJ) NetAddress.$(OBJ) IOHandlers.$(OBJ)
++GROUPSOCK_LIBS = ../BasicUsageEnvironment/libBasicUsageEnvironment.$(LIB_SUFFIX)
+ 
+ GroupsockHelper.$(CPP):	include/GroupsockHelper.hh
+ include/GroupsockHelper.hh:	include/NetAddress.hh
+@@ -26,9 +27,9 @@
+ IOHandlers.$(CPP):	include/IOHandlers.hh include/TunnelEncaps.hh
+ 
+ libgroupsock.$(LIB_SUFFIX): $(GROUPSOCK_LIB_OBJS) \
+-    $(PLATFORM_SPECIFIC_LIB_OBJS)
++    $(PLATFORM_SPECIFIC_LIB_OBJS) $(GROUPSOCK_LIBS)
+ 	$(LIBRARY_LINK)$@ $(LIBRARY_LINK_OPTS) \
+-		$(GROUPSOCK_LIB_OBJS)
++		$(GROUPSOCK_LIB_OBJS) $(GROUPSOCK_LIBS)
+ 
+ clean:
+ 	-rm -rf *.$(OBJ) $(ALL) core *.core *~ include/*~
+diff -r a467df21e246 -r d1fda89b91cd liveMedia/Makefile.tail
+--- a/liveMedia/Makefile.tail	Fri Mar 12 11:30:13 2010 -0500
++++ b/liveMedia/Makefile.tail	Fri Mar 12 12:19:11 2010 -0500
+@@ -42,11 +42,12 @@
+ MISC_OBJS = DarwinInjector.$(OBJ) BitVector.$(OBJ) StreamParser.$(OBJ) DigestAuthentication.$(OBJ) our_md5.$(OBJ) our_md5hl.$(OBJ) Base64.$(OBJ) Locale.$(OBJ)
+ 
+ LIVEMEDIA_LIB_OBJS = Media.$(OBJ) $(MISC_SOURCE_OBJS) $(MISC_SINK_OBJS) $(MISC_FILTER_OBJS) $(RTP_OBJS) $(RTCP_OBJS) $(RTSP_OBJS) $(SIP_OBJS) $(SESSION_OBJS) $(QUICKTIME_OBJS) $(AVI_OBJS) $(TRANSPORT_STREAM_TRICK_PLAY_OBJS) $(MISC_OBJS)
++LIVEMEDIA_LIBS =  ../groupsock/libgroupsock.$(LIB_SUFFIX) ../BasicUsageEnvironment/libBasicUsageEnvironment.$(LIB_SUFFIX)
+ 
+-$(LIVEMEDIA_LIB): $(LIVEMEDIA_LIB_OBJS) \
++$(LIVEMEDIA_LIB): $(LIVEMEDIA_LIB_OBJS) $(LIVEMEDIA_LIBS) \
+     $(PLATFORM_SPECIFIC_LIB_OBJS)
+ 	$(LIBRARY_LINK)$@ $(LIBRARY_LINK_OPTS) \
+-		$(LIVEMEDIA_LIB_OBJS)
++		$(LIVEMEDIA_LIB_OBJS) $(LIVEMEDIA_LIBS)
+ 
+ Media.$(CPP):		include/Media.hh
+ include/Media.hh:	include/liveMedia_version.hh
diff --git a/media-plugins/live/files/live-2009.09.28-buildorder.patch b/media-plugins/live/files/live-2009.09.28-buildorder.patch
new file mode 100644
--- /dev/null
+++ b/media-plugins/live/files/live-2009.09.28-buildorder.patch
@@ -0,0 +1,27 @@
+Author: Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
+Purpose: to help facilitate building liveMedia with libtool by making sure that the libtool archive files different targets need already exist before telling libtool to link against then. (i.e., to fix the build order).
+
+diff -r 7f99bfe34df0 Makefile.tail
+--- a/Makefile.tail	Sat Mar 13 02:18:02 2010 -0500
++++ b/Makefile.tail	Sat Mar 13 02:19:05 2010 -0500
+@@ -10,17 +10,17 @@
+ MEDIA_SERVER_DIR = mediaServer
+ 
+ all:
+-	cd $(LIVEMEDIA_DIR) ; $(MAKE)
+-	cd $(GROUPSOCK_DIR) ; $(MAKE)
+ 	cd $(USAGE_ENVIRONMENT_DIR) ; $(MAKE)
+ 	cd $(BASIC_USAGE_ENVIRONMENT_DIR) ; $(MAKE)
++	cd $(GROUPSOCK_DIR) ; $(MAKE)
++	cd $(LIVEMEDIA_DIR) ; $(MAKE)
+ 	cd $(TESTPROGS_DIR) ; $(MAKE)
+ 	cd $(MEDIA_SERVER_DIR) ; $(MAKE)
+ 
+ clean:
+-	cd $(LIVEMEDIA_DIR) ; $(MAKE) clean
+ 	cd $(GROUPSOCK_DIR) ; $(MAKE) clean
+ 	cd $(USAGE_ENVIRONMENT_DIR) ; $(MAKE) clean
+ 	cd $(BASIC_USAGE_ENVIRONMENT_DIR) ; $(MAKE) clean
++	cd $(LIVEMEDIA_DIR) ; $(MAKE) clean
+ 	cd $(TESTPROGS_DIR) ; $(MAKE) clean
+ 	cd $(MEDIA_SERVER_DIR) ; $(MAKE) clean
diff --git a/media-plugins/live/files/live-recursive.patch b/media-plugins/live/files/live-recursive.patch
--- a/media-plugins/live/files/live-recursive.patch
+++ b/media-plugins/live/files/live-recursive.patch
@@ -2,10 +2,11 @@ Index: live/Makefile.tail
 ===================================================================
 --- live.orig/Makefile.tail
 +++ live/Makefile.tail
-@@ -14,8 +14,6 @@ all:
- 	cd $(GROUPSOCK_DIR) ; $(MAKE)
+@@ -14,9 +14,7 @@ all:
  	cd $(USAGE_ENVIRONMENT_DIR) ; $(MAKE)
  	cd $(BASIC_USAGE_ENVIRONMENT_DIR) ; $(MAKE)
+ 	cd $(GROUPSOCK_DIR) ; $(MAKE)
+ 	cd $(LIVEMEDIA_DIR) ; $(MAKE)
 -	cd $(TESTPROGS_DIR) ; $(MAKE)
 -	cd $(MEDIA_SERVER_DIR) ; $(MAKE)
  
diff --git a/media-plugins/live/live-2008.09.02.ebuild b/media-plugins/live/live-2008.09.02.ebuild
deleted file mode 100644
--- a/media-plugins/live/live-2008.09.02.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/live/live-2008.09.02.ebuild,v 1.7 2008/10/18 14:45:49 armin76 Exp $
-
-inherit flag-o-matic eutils toolchain-funcs multilib
-
-DESCRIPTION="Source-code libraries for standards-based RTP/RTCP/RTSP multimedia streaming, suitable for embedded and/or low-cost streaming applications"
-HOMEPAGE="http://www.live555.com/"
-SRC_URI="http://www.live555.com/liveMedia/public/${P/-/.}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-S="${WORKDIR}"
-
-# Alexis Ballier <aballier@gentoo.org>
-# Be careful, bump this everytime you bump the package and the ABI has changed.
-# If you don't know, ask someone.
-LIVE_ABI_VERSION=1
-
-src_unpack() {
-	unpack ${A}
-	cd "${WORKDIR}"
-
-	cp -pPR live live-shared
-	mv live live-static
-
-	cp "${FILESDIR}/config.gentoo" live-static
-	cp "${FILESDIR}/config.gentoo-so" live-shared
-}
-
-src_compile() {
-	tc-export CC CXX LD
-
-	cd "${WORKDIR}/live-static"
-
-	einfo "Beginning static library build"
-	./genMakefiles gentoo
-	emake -j1 LINK_OPTS="-L. $(raw-ldflags)" TESTPROGS_APP="" MEDIA_SERVER_APP="" || die "failed to build static libraries"
-
-	einfo "Beginning programs build"
-	cd "${WORKDIR}/live-static/testProgs"
-	emake LINK_OPTS="-L. ${LDFLAGS}" || die "failed to build test programs"
-	cd "${WORKDIR}/live-static/mediaServer"
-	emake LINK_OPTS="-L. ${LDFLAGS}" || die "failed to build the mediaserver"
-
-	cd "${WORKDIR}/live-shared"
-	einfo "Beginning shared library build"
-	./genMakefiles gentoo-so
-	emake -j1 LINK_OPTS="-L. ${LDFLAGS}" LIB_SUFFIX="so.${LIVE_ABI_VERSION}" TESTPROGS_APP="" MEDIA_SERVER_APP="" || die "failed to build shared libraries"
-}
-
-src_install() {
-	for library in UsageEnvironment liveMedia BasicUsageEnvironment groupsock; do
-		dolib.a live-static/${library}/lib${library}.a
-		dolib.so live-shared/${library}/lib${library}.so.${LIVE_ABI_VERSION}
-		dosym lib${library}.so.${LIVE_ABI_VERSION} /usr/$(get_libdir)/lib${library}.so
-
-		insinto /usr/include/${library}
-		doins live-shared/${library}/include/*h
-	done
-
-	# Should we really install these?
-	find live-static/testProgs -type f -perm +111 -print0 | \
-		xargs -0 dobin
-
-	#install included live555MediaServer aplication
-	dobin live-static/mediaServer/live555MediaServer
-
-	# install docs
-	dodoc live-static/README
-}
-
-pkg_postinst() {
-	ewarn "If you are upgrading from a version prior to live-2008.02.08"
-	ewarn "Please make sure to rebuild applications built against ${PN}"
-	ewarn "like vlc or mplayer. ${PN} may have had ABI changes and ${PN}"
-	ewarn "support might be broken."
-}
diff --git a/media-plugins/live/live-2009.06.02.ebuild b/media-plugins/live/live-2009.06.02.ebuild
--- a/media-plugins/live/live-2009.06.02.ebuild
+++ b/media-plugins/live/live-2009.06.02.ebuild
@@ -2,75 +2,80 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-plugins/live/live-2009.06.02.ebuild,v 1.8 2010/01/06 16:55:17 ranger Exp $
 
-inherit flag-o-matic eutils toolchain-funcs multilib
+EAPI="2"
 
-DESCRIPTION="Source-code libraries for standards-based RTP/RTCP/RTSP multimedia streaming, suitable for embedded and/or low-cost streaming applications"
+inherit eutils flag-o-matic toolchain-funcs multilib
+
+DESCRIPTION="Standards-based RTP/RTCP/RTSP multimedia streaming for embedded streaming applications"
 HOMEPAGE="http://www.live555.com/"
 SRC_URI="http://www.live555.com/liveMedia/public/${P/-/.}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
+IUSE="static-libs"
 
-S="${WORKDIR}"
+DEPEND="sys-devel/libtool"
+RDEPEND=""
+
+S=${WORKDIR}/${PN}
 
 # Alexis Ballier <aballier@gentoo.org>
 # Be careful, bump this everytime you bump the package and the ABI has changed.
 # If you don't know, ask someone.
 LIVE_ABI_VERSION=3
 
-src_unpack() {
-	unpack ${A}
-	cd "${WORKDIR}"
+src_prepare() {
+	cp "${FILESDIR}"/config.gentoo ./ || die
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+	epatch "${FILESDIR}"/${P}-buildorder.patch
+	epatch "${FILESDIR}"/${P}-libdeps.patch
+}
 
-	cp -pPR live live-shared
-	mv live live-static
+src_configure() {
+	tc-export CC CXX
+	export LIVE_ABI_VERSION LIBDIR=/usr/$(get_libdir)
 
-	cp "${FILESDIR}/config.gentoo" live-static
-	cp "${FILESDIR}/config.gentoo-so" live-shared
+	if ! use static-libs; then
+		append-flags -shared
+		append-ldflags -shared
+	fi
+
+	./genMakefiles gentoo
 }
 
 src_compile() {
-	tc-export CC CXX LD
-
-	cd "${WORKDIR}/live-static"
-
-	einfo "Beginning static library build"
-	./genMakefiles gentoo
-	emake -j1 LINK_OPTS="-L. $(raw-ldflags)" TESTPROGS_APP="" MEDIA_SERVER_APP="" || die "failed to build static libraries"
+	einfo "Beginning library build"
+	emake -j1 TESTPROGS_APP="" MEDIA_SERVER_APP="" || die "failed to build libraries"
 
 	einfo "Beginning programs build"
-	cd "${WORKDIR}/live-static/testProgs"
-	emake LINK_OPTS="-L. ${LDFLAGS}" || die "failed to build test programs"
-	cd "${WORKDIR}/live-static/mediaServer"
-	emake LINK_OPTS="-L. ${LDFLAGS}" || die "failed to build the mediaserver"
-
-	cd "${WORKDIR}/live-shared"
-	einfo "Beginning shared library build"
-	./genMakefiles gentoo-so
-	emake -j1 LINK_OPTS="-L. ${LDFLAGS}" LIB_SUFFIX="so.${LIVE_ABI_VERSION}" TESTPROGS_APP="" MEDIA_SERVER_APP="" || die "failed to build shared libraries"
+	emake -C testProgs || die "failed to build test programs"
+	emake -C mediaServer || die "failed to build the mediaserver"
 }
 
 src_install() {
+	dodir /usr/{$(get_libdir),bin} || die
 	for library in UsageEnvironment liveMedia BasicUsageEnvironment groupsock; do
-		dolib.a live-static/${library}/lib${library}.a
-		dolib.so live-shared/${library}/lib${library}.so.${LIVE_ABI_VERSION}
-		dosym lib${library}.so.${LIVE_ABI_VERSION} /usr/$(get_libdir)/lib${library}.so
+		libtool --mode=install install -c ${library}/lib${library}.la "${D}"/usr/$(get_libdir)/ || die
+
+		if ! use static-libs; then
+			# make tommy happy --ohnobinki
+			rm -v "${D}"/usr/$(get_libdir)/lib${library}.la || die
+		fi
 
 		insinto /usr/include/${library}
-		doins live-shared/${library}/include/*h
+		doins ${library}/include/*h || die
 	done
 
 	# Should we really install these?
-	find live-static/testProgs -type f -perm +111 -print0 | \
-		xargs -0 dobin
+	find testProgs -type f -perm +111 \
+		-exec libtool --mode=install install -c '{}' "${D}"/usr/bin/ \; || die
 
-	#install included live555MediaServer aplication
-	dobin live-static/mediaServer/live555MediaServer
+	#install included live555MediaServer application
+	libtool --mode=install install -c mediaServer/live555MediaServer "${D}"/usr/bin/ || die
 
 	# install docs
-	dodoc live-static/README
+	dodoc README || die
 }
 
 pkg_postinst() {
diff --git a/media-plugins/live/live-2009.09.28.ebuild b/media-plugins/live/live-2009.09.28.ebuild
--- a/media-plugins/live/live-2009.09.28.ebuild
+++ b/media-plugins/live/live-2009.09.28.ebuild
@@ -1,77 +1,81 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-plugins/live/live-2009.09.28.ebuild,v 1.1 2009/09/29 07:03:26 aballier Exp $
 
-inherit flag-o-matic eutils toolchain-funcs multilib
+EAPI="2"
 
-DESCRIPTION="Source-code libraries for standards-based RTP/RTCP/RTSP multimedia streaming, suitable for embedded and/or low-cost streaming applications"
+inherit eutils flag-o-matic toolchain-funcs multilib
+
+DESCRIPTION="Standards-based RTP/RTCP/RTSP multimedia streaming for embedded streaming applications"
 HOMEPAGE="http://www.live555.com/"
 SRC_URI="http://www.live555.com/liveMedia/public/${P/-/.}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
+IUSE="static-libs"
 
-S="${WORKDIR}"
+DEPEND="sys-devel/libtool"
+RDEPEND=""
+
+S=${WORKDIR}/${PN}
 
 # Alexis Ballier <aballier@gentoo.org>
 # Be careful, bump this everytime you bump the package and the ABI has changed.
 # If you don't know, ask someone.
 LIVE_ABI_VERSION=3
 
-src_unpack() {
-	unpack ${A}
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}/${PN}-recursive.patch"
+src_prepare() {
+	cp "${FILESDIR}"/config.gentoo ./ || die
+	epatch "${FILESDIR}"/${P}-buildorder.patch
+	epatch "${FILESDIR}"/${PN}-2009.06.02-libdeps.patch
+	epatch "${FILESDIR}"/${PN}-recursive.patch
+}
 
-	cp -pPR live live-shared
-	mv live live-static
+src_configure() {
+	tc-export CC CXX
+	export LIVE_ABI_VERSION LIBDIR=/usr/$(get_libdir)
 
-	cp "${FILESDIR}/config.gentoo" live-static
-	cp "${FILESDIR}/config.gentoo-so-r1" live-shared
+	if ! use static-libs; then
+		append-flags -shared
+		append-ldflags -shared
+	fi
+
+	./genMakefiles gentoo
 }
 
 src_compile() {
-	tc-export CC CXX LD
-
-	cd "${WORKDIR}/live-static"
-
-	einfo "Beginning static library build"
-	./genMakefiles gentoo
-	emake -j1 LINK_OPTS="-L. $(raw-ldflags)" || die "failed to build static libraries"
+	einfo "Beginning library build"
+	emake -j1 || die "failed to build libraries"
 
 	einfo "Beginning programs build"
-	cd "${WORKDIR}/live-static/testProgs"
-	emake LINK_OPTS="-L. ${LDFLAGS}" || die "failed to build test programs"
-	cd "${WORKDIR}/live-static/mediaServer"
-	emake LINK_OPTS="-L. ${LDFLAGS}" || die "failed to build the mediaserver"
-
-	cd "${WORKDIR}/live-shared"
-	einfo "Beginning shared library build"
-	./genMakefiles gentoo-so-r1
-	emake -j1 LINK_OPTS="-L. ${LDFLAGS}" LIB_SUFFIX="so.${LIVE_ABI_VERSION}" || die "failed to build shared libraries"
+	emake -C testProgs || die "failed to build test programs"
+	emake -C mediaServer || die "failed to build the mediaserver"
 }
 
 src_install() {
+	dodir /usr/{$(get_libdir),bin} || die
 	for library in UsageEnvironment liveMedia BasicUsageEnvironment groupsock; do
-		dolib.a live-static/${library}/lib${library}.a
-		dolib.so live-shared/${library}/lib${library}.so.${LIVE_ABI_VERSION}
-		dosym lib${library}.so.${LIVE_ABI_VERSION} /usr/$(get_libdir)/lib${library}.so
+		libtool --mode=install install -c ${library}/lib${library}.la "${D}"/usr/$(get_libdir)/ || die
+
+		if ! use static-libs; then
+			# make tommy happy --ohnobinki
+			rm -v "${D}"/usr/$(get_libdir)/lib${library}.la || die
+		fi
 
 		insinto /usr/include/${library}
-		doins live-shared/${library}/include/*h
+		doins ${library}/include/*h || die
 	done
 
 	# Should we really install these?
-	find live-static/testProgs -type f -perm +111 -print0 | \
-		xargs -0 dobin
+	find testProgs -type f -perm +111 \
+		-exec libtool --mode=install install -c '{}' "${D}"/usr/bin/ \; || die
 
-	#install included live555MediaServer aplication
-	dobin live-static/mediaServer/live555MediaServer
+	#install included live555MediaServer application
+	libtool --mode=install install -c mediaServer/live555MediaServer "${D}"/usr/bin/ || die
 
 	# install docs
-	dodoc live-static/README
+	dodoc README || die
 }
 
 pkg_postinst() {
diff --git a/media-plugins/live/live-2009.11.12.ebuild b/media-plugins/live/live-2009.11.12.ebuild
--- a/media-plugins/live/live-2009.11.12.ebuild
+++ b/media-plugins/live/live-2009.11.12.ebuild
@@ -1,77 +1,78 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-plugins/live/live-2009.11.12.ebuild,v 1.1 2009/11/21 12:23:51 aballier Exp $
 
-inherit flag-o-matic eutils toolchain-funcs multilib
+EAPI="2"
 
-DESCRIPTION="Source-code libraries for standards-based RTP/RTCP/RTSP multimedia streaming, suitable for embedded and/or low-cost streaming applications"
+inherit eutils flag-o-matic eutils toolchain-funcs multilib
+
+DESCRIPTION="Standards-based RTP/RTCP/RTSP multimedia streaming for embedded streaming applications"
 HOMEPAGE="http://www.live555.com/"
 SRC_URI="http://www.live555.com/liveMedia/public/${P/-/.}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
+IUSE="static-libs"
 
-S="${WORKDIR}"
+S=${WORKDIR}/${PN}
 
 # Alexis Ballier <aballier@gentoo.org>
 # Be careful, bump this everytime you bump the package and the ABI has changed.
 # If you don't know, ask someone.
 LIVE_ABI_VERSION=3
 
-src_unpack() {
-	unpack ${A}
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}/${PN}-recursive.patch"
+src_prepare() {
+	cp "${FILESDIR}"/config.gentoo ./ || die
+	epatch "${FILESDIR}"/${PN}-2009.09.28-buildorder.patch
+	epatch "${FILESDIR}"/${PN}-2009.06.02-libdeps.patch
+	epatch "${FILESDIR}"/${PN}-recursive.patch
+}
 
-	cp -pPR live live-shared
-	mv live live-static
+src_configure() {
+	tc-export CC CXX
+	export LIVE_ABI_VERSION LIBDIR=/usr/$(get_libdir)
 
-	cp "${FILESDIR}/config.gentoo" live-static
-	cp "${FILESDIR}/config.gentoo-so-r1" live-shared
+	if ! use static-libs; then
+		append-flags -shared
+		append-ldflags -shared
+	fi
+
+	./genMakefiles gentoo
 }
 
 src_compile() {
-	tc-export CC CXX LD
-
-	cd "${WORKDIR}/live-static"
-
-	einfo "Beginning static library build"
-	./genMakefiles gentoo
-	emake -j1 LINK_OPTS="-L. $(raw-ldflags)" || die "failed to build static libraries"
+	einfo "Beginning library build"
+	emake -j1 || die "failed to build libraries"
 
 	einfo "Beginning programs build"
-	cd "${WORKDIR}/live-static/testProgs"
-	emake LINK_OPTS="-L. ${LDFLAGS}" || die "failed to build test programs"
-	cd "${WORKDIR}/live-static/mediaServer"
-	emake LINK_OPTS="-L. ${LDFLAGS}" || die "failed to build the mediaserver"
-
-	cd "${WORKDIR}/live-shared"
-	einfo "Beginning shared library build"
-	./genMakefiles gentoo-so-r1
-	emake -j1 LINK_OPTS="-L. ${LDFLAGS}" LIB_SUFFIX="so.${LIVE_ABI_VERSION}" || die "failed to build shared libraries"
+	emake -C testProgs || die "failed to build test programs"
+	emake -C mediaServer || die "failed to build the mediaserver"
 }
 
 src_install() {
+	dodir /usr/{$(get_libdir),bin} || die
 	for library in UsageEnvironment liveMedia BasicUsageEnvironment groupsock; do
-		dolib.a live-static/${library}/lib${library}.a
-		dolib.so live-shared/${library}/lib${library}.so.${LIVE_ABI_VERSION}
-		dosym lib${library}.so.${LIVE_ABI_VERSION} /usr/$(get_libdir)/lib${library}.so
+		libtool --mode=install install -c ${library}/lib${library}.la "${D}"/usr/$(get_libdir)/ || die
+
+		if ! use static-libs; then
+			# make tommy happy --ohnobinki
+			rm -v "${D}"/usr/$(get_libdir)/lib${library}.la || die
+		fi
 
 		insinto /usr/include/${library}
-		doins live-shared/${library}/include/*h
+		doins ${library}/include/*h || die
 	done
 
 	# Should we really install these?
-	find live-static/testProgs -type f -perm +111 -print0 | \
-		xargs -0 dobin
+	find testProgs -type f -perm +111 \
+		-exec libtool --mode=install install -c '{}' "${D}"/usr/bin/ \; || die
 
 	#install included live555MediaServer aplication
-	dobin live-static/mediaServer/live555MediaServer
+	libtool --mode=install install -c mediaServer/live555MediaServer "${D}"/usr/bin/ || die
 
 	# install docs
-	dodoc live-static/README
+	dodoc README || die
 }
 
 pkg_postinst() {