[patch] patch against gkrellm-2.3.5-r1.ebuild

gkrellm-2.3.5-r1.ebuild.patch (text/plain), 2.18 KB, created by Christoph Junghans (RETIRED) on 2012-12-16 02:50:29 UTC

--- /usr/portage/app-admin/gkrellm/gkrellm-2.3.5-r1.ebuild	2012-06-27 11:52:13.000000000 -0600
+++ gkrellm-2.3.5-r1.ebuild	2012-12-15 19:40:34.585588646 -0700
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-3"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="hddtemp gnutls lm_sensors nls ssl ntlm X kernel_FreeBSD"
 
 RDEPEND="dev-libs/glib:2
@@ -37,18 +37,20 @@
 src_prepare() {
 	sed -e 's:-O2 ::' \
 		-e 's:override CC:CFLAGS:' \
+		-e 's:-L/usr/X11R6/lib::' \
 		-i */Makefile || die "sed Makefile(s) failed"
 
 	sed -e 's:#user\tnobody:user\tgkrellmd:' \
 		-e 's:#group\tproc:group\tgkrellmd:' \
 		-i server/gkrellmd.conf || die "sed gkrellmd.conf failed"
 
-	sed -e "s:/usr/lib:/usr/$(get_libdir):" \
-		-e "s:/usr/local/lib:/usr/local/$(get_libdir):" \
+	sed -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):" \
+		-e "s:/usr/local/lib:${EPREFIX}/usr/local/$(get_libdir):" \
 		-i src/${PN}.h || die "sed ${PN}.h failed"
 
 	epatch "${FILESDIR}/${P}-autofs.patch"
 	epatch "${FILESDIR}/${P}-cifs.patch"
+	epatch "${FILESDIR}/${P}-dso.patch"
 }
 
 src_compile() {
@@ -65,9 +67,9 @@
 		emake ${TARGET} \
 			CC="$(tc-getCC)" \
 			STRIP="" \
-			INSTALLROOT="/usr" \
-			INCLUDEDIR="/usr/include/gkrellm2" \
-			LOCALEDIR="/usr/share/locale" \
+			INSTALLROOT="${EPREFIX}/usr" \
+			INCLUDEDIR="${EPREFIX}/usr/include/gkrellm2" \
+			LOCALEDIR="${EPREFIX}/usr/share/locale" \
 			$(use nls || echo enable_nls=0) \
 			$(use lm_sensors || echo without-libsensors=yes) \
 			$(use ntlm || echo without-ntlm=yes) \
@@ -90,11 +92,11 @@
 		emake install${TARGET:+_}${TARGET} \
 			$(use nls || echo enable_nls=0) \
 			STRIP="" \
-			INSTALLDIR="${D}/usr/bin" \
-			INCLUDEDIR="${D}/usr/include" \
-			LOCALEDIR="${D}/usr/share/locale" \
-			PKGCONFIGDIR="${D}/usr/$(get_libdir)/pkgconfig" \
-			MANDIR="${D}/usr/share/man/man1" \
+			INSTALLDIR="${ED}/usr/bin" \
+			INCLUDEDIR="${ED}/usr/include" \
+			LOCALEDIR="${ED}/usr/share/locale" \
+			PKGCONFIGDIR="${ED}/usr/$(get_libdir)/pkgconfig" \
+			MANDIR="${ED}/usr/share/man/man1" \
 		|| die "emake install failed"
 
 		dohtml *.html