Index: gst-plugins-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gst-plugins-base.eclass,v
retrieving revision 1.15
diff -u -b -B -r1.15 gst-plugins-base.eclass
--- gst-plugins-base.eclass	16 Nov 2009 00:38:24 -0000	1.15
+++ gst-plugins-base.eclass	23 Feb 2010 22:51:55 -0000
@@ -14,7 +14,7 @@
 # Gentoo developers responsible for gstreamer <gnome@gentoo.org>, the application developer
 # or the gstreamer team.
 
-inherit eutils gst-plugins10
+inherit eutils gst-plugins10 versionator
 
 GST_EXPF="src_unpack src_compile src_install"
 case ${EAPI:-0} in
@@ -29,6 +29,7 @@
 ###
 
 MY_PN=gst-plugins-base
+MY_PV=$(get_version_component_range 1-2)
 MY_P=${MY_PN}-${PV}
 # All relevant configure options for gst-plugins
 # need a better way to extract these
@@ -94,22 +95,22 @@
 
 	# Link with the syswide installed gst-libs if needed
 	gst-plugins10_find_plugin_dir
-	sed -e "s:\$(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces:${ROOT}/usr/$(get_libdir)/libgstinterfaces:" \
-		-e "s:\${top_builddir}/gst-libs/gst/interfaces/libgstinterfaces:${ROOT}/usr/$(get_libdir)/libgstinterfaces:" \
-		-e "s:\$(top_builddir)/gst-libs/gst/audio/libgstaudio:${ROOT}/usr/$(get_libdir)/libgstaudio:" \
-		-e "s:\${top_builddir}/gst-libs/gst/audio/libgstaudio:${ROOT}/usr/$(get_libdir)/libgstaudio:" \
-		-e "s:\$(top_builddir)/gst-libs/gst/cdda/libgstcdda:${ROOT}/usr/$(get_libdir)/libgstcdda:" \
-		-e "s:\${top_builddir}/gst-libs/gst/cdda/libgstcdda:${ROOT}/usr/$(get_libdir)/libgstcdda:" \
-		-e "s:\$(top_builddir)/gst-libs/gst/riff/libgstriff:${ROOT}/usr/$(get_libdir)/libgstriff:" \
-		-e "s:\${top_builddir}/gst-libs/gst/riff/libgstriff:${ROOT}/usr/$(get_libdir)/libgstriff:" \
-		-e "s:\$(top_builddir)/gst-libs/gst/tag/libgsttag:${ROOT}/usr/$(get_libdir)/libgsttag:" \
-		-e "s:\${top_builddir}/gst-libs/gst/tag/libgsttag:${ROOT}/usr/$(get_libdir)/libgsttag:" \
-		-e "s:\$(top_builddir)/gst-libs/gst/video/libgstvideo:${ROOT}/usr/$(get_libdir)/libgstvideo:" \
-		-e "s:\${top_builddir}/gst-libs/gst/video/libgstvideo:${ROOT}/usr/$(get_libdir)/libgstvideo:" \
-		-e "s:\$(top_builddir)/gst-libs/gst/netbuffer/libgstnetbuffer:${ROOT}/usr/$(get_libdir)/libgstnetbuffer:" \
-		-e "s:\${top_builddir}/gst-libs/gst/netbuffer/libgstnetbuffer:${ROOT}/usr/$(get_libdir)/libgstnetbuffer:" \
-		-e "s:\$(top_builddir)/gst-libs/gst/rtp/libgstrtp:${ROOT}/usr/$(get_libdir)/libgstrtp:" \
-		-e "s:\${top_builddir}/gst-libs/gst/rtp/libgstrtp:${ROOT}/usr/$(get_libdir)/libgstrtp:" \
+	sed -e "s:\$(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces.*\.la:$(pkg-config --libs-only-L --libs-only-l gstreamer-interfaces-${MY_PV}):" \
+		-e "s:\${top_builddir}/gst-libs/gst/interfaces/libgstinterfaces.*\.la:$(pkg-config --libs-only-L --libs-only-l gstreamer-interfaces-${MY_PV}):" \
+		-e "s:\$(top_builddir)/gst-libs/gst/audio/libgstaudio.*\.la:$(pkg-config --libs-only-L --libs-only-l gstreamer-audio-${MY_PV}):" \
+		-e "s:\${top_builddir}/gst-libs/gst/audio/libgstaudio.*\.la:$(pkg-config --libs-only-L --libs-only-l gstreamer-audio-${MY_PV}):" \
+		-e "s:\$(top_builddir)/gst-libs/gst/cdda/libgstcdda.*\.la:$(pkg-config --libs-only-L --libs-only-l gstreamer-cdda-${MY_PV}):" \
+		-e "s:\${top_builddir}/gst-libs/gst/cdda/libgstcdda.*\.la:$(pkg-config --libs-only-L --libs-only-l gstreamer-cdda-${MY_PV}):" \
+		-e "s:\$(top_builddir)/gst-libs/gst/riff/libgstriff.*\.la:$(pkg-config --libs-only-L --libs-only-l gstreamer-riff-${MY_PV}):" \
+		-e "s:\${top_builddir}/gst-libs/gst/riff/libgstriff.*\.la:$(pkg-config --libs-only-L --libs-only-l gstreamer-riff-${MY_PV}):" \
+		-e "s:\$(top_builddir)/gst-libs/gst/tag/libgsttag.*\.la:$(pkg-config --libs-only-L --libs-only-l gstreamer-tag-${MY_PV}):" \
+		-e "s:\${top_builddir}/gst-libs/gst/tag/libgsttag.*\.la:$(pkg-config --libs-only-L --libs-only-l gstreamer-tag-${MY_PV}):" \
+		-e "s:\$(top_builddir)/gst-libs/gst/video/libgstvideo.*\.la:$(pkg-config --libs-only-L --libs-only-l gstreamer-video-${MY_PV}):" \
+		-e "s:\${top_builddir}/gst-libs/gst/video/libgstvideo.*\.la:$(pkg-config --libs-only-L --libs-only-l gstreamer-video-${MY_PV}):" \
+		-e "s:\$(top_builddir)/gst-libs/gst/netbuffer/libgstnetbuffer.*\.la:$(pkg-config --libs-only-L --libs-only-l gstreamer-netbuffer-${MY_PV}):" \
+		-e "s:\${top_builddir}/gst-libs/gst/netbuffer/libgstnetbuffer.*\.la:$(pkg-config --libs-only-L --libs-only-l gstreamer-netbuffer-${MY_PV}):" \
+		-e "s:\$(top_builddir)/gst-libs/gst/rtp/libgstrtp.*\.la:$(pkg-config --libs-only-L --libs-only-l gstreamer-rtp-${MY_PV}):" \
+		-e "s:\${top_builddir}/gst-libs/gst/rtp/libgstrtp.*\.la:$(pkg-config --libs-only-L --libs-only-l gstreamer-rtp-${MY_PV}):" \
 		-i Makefile.in
 #	cd ${S}