summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Schwarzott <zzam@gentoo.org>2006-01-24 18:42:10 +0000
committerMatthias Schwarzott <zzam@gentoo.org>2006-01-24 18:42:10 +0000
commit28f5a1b6b27b8ea45ca2ecbc1d0d42d3ae19094b (patch)
treec33ad3bf324fbf0287eca64435cd88c68640033f /media-tv
parentStable on ppc64 (diff)
downloadgentoo-2-28f5a1b6b27b8ea45ca2ecbc1d0d42d3ae19094b.tar.gz
gentoo-2-28f5a1b6b27b8ea45ca2ecbc1d0d42d3ae19094b.tar.bz2
gentoo-2-28f5a1b6b27b8ea45ca2ecbc1d0d42d3ae19094b.zip
Make ebuild work with other architectures than x86
(Portage version: 2.1_pre3-r1)
Diffstat (limited to 'media-tv')
-rw-r--r--media-tv/tvbrowser/ChangeLog5
-rw-r--r--media-tv/tvbrowser/Manifest12
-rw-r--r--media-tv/tvbrowser/tvbrowser-2.1.ebuild18
3 files changed, 18 insertions, 17 deletions
diff --git a/media-tv/tvbrowser/ChangeLog b/media-tv/tvbrowser/ChangeLog
index 8dab5a35ceaa..c4eea25ffac1 100644
--- a/media-tv/tvbrowser/ChangeLog
+++ b/media-tv/tvbrowser/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-tv/tvbrowser
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/ChangeLog,v 1.1 2006/01/22 12:37:59 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/ChangeLog,v 1.2 2006/01/24 18:42:10 zzam Exp $
+
+ 24 Jan 2006; Matthias Schwarzott <zzam@gentoo.org> tvbrowser-2.1.ebuild:
+ Make ebuild work with other architectures than x86
*tvbrowser-2.1 (22 Jan 2006)
diff --git a/media-tv/tvbrowser/Manifest b/media-tv/tvbrowser/Manifest
index 339d5e5ee566..0467a005af58 100644
--- a/media-tv/tvbrowser/Manifest
+++ b/media-tv/tvbrowser/Manifest
@@ -1,15 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
MD5 a9dac222b889059029c42080e537c77a ChangeLog 449
MD5 45b73b563b0dfda4f6005e25c5a01a44 files/digest-tvbrowser-2.1 129
MD5 2a50d11a23b770a3d4b7b34bbaca2c36 files/tvbrowser-2.1-makefiles.patch 3385
MD5 7c30ab7528b676a1a0c2737821599b29 metadata.xml 300
-MD5 cf476b6042d16e494bccbe51bec7fa03 tvbrowser-2.1.ebuild 2627
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD03zZZfSl1Kp5KmoRAvfQAKCP/e8k8eVTATN+hKMxHsmsye5o7QCgo+qL
-/j/3mwHZwiI7z2BKxpPXr0A=
-=7ZjY
------END PGP SIGNATURE-----
+MD5 22e7d0859fe293b82f03d38f3677f330 tvbrowser-2.1.ebuild 2850
diff --git a/media-tv/tvbrowser/tvbrowser-2.1.ebuild b/media-tv/tvbrowser/tvbrowser-2.1.ebuild
index fdaea5d5f3ce..09c46d9424c8 100644
--- a/media-tv/tvbrowser/tvbrowser-2.1.ebuild
+++ b/media-tv/tvbrowser/tvbrowser-2.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/media-tv/tvbrowser/tvbrowser-2.1.ebuild,v 1.1 2006/01/22 12:37:59 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/tvbrowser-2.1.ebuild,v 1.2 2006/01/24 18:42:10 zzam Exp $
-inherit eutils java-pkg libtool
+inherit eutils java-pkg libtool flag-o-matic
DESCRIPTION="Themeable and easy to use TV Guide - written in Java"
HOMEPAGE="http://www.tvbrowser.org/"
@@ -35,6 +35,16 @@ src_unpack() {
epatch ${FILESDIR}/${P}-makefiles.patch
+ local J_ARCH
+ case "${ARCH}" in
+ x86) J_ARCH=i386 ;;
+ amd64) J_ARCH=amd64 ;;
+ *) die "not supported arch for this ebuild" ;;
+ esac
+
+ sed -i ${S}/deployment/x11/src/Makefile.am \
+ -e "s-/lib/i386/-/lib/${J_ARCH}/-"
+
cd ${S}/lib
rm *.jar
@@ -44,9 +54,6 @@ src_unpack() {
java-pkg_jar-from bsh bsh.jar bsh-2.0b1.jar
java-pkg_jar-from skinlf
- cd ${S}
- find -name "*.jar"
-
cd ${S}/deployment/x11
rm configure
@@ -64,6 +71,7 @@ src_compile() {
# second part: systray-module
cd ${S}/deployment/x11
+ append-flags -fPIC
econf || die "econf failed"
emake || die "emake failed"
}