From 5a38b16a27abaf57fb8467eaabb57b24ba18221c Mon Sep 17 00:00:00 2001 From: Jakub Moc Date: Mon, 9 Apr 2007 20:25:16 +0000 Subject: app-misc/zgsmplay: Rewrite from scratch, add ~x86 keyword svn path=/sunrise/; revision=3396 --- app-misc/zgsmplay/ChangeLog | 4 + app-misc/zgsmplay/Manifest | 5 +- .../zgsmplay/files/zgsmplay-1.4-makefile.patch | 100 +++++++++++++++++++++ app-misc/zgsmplay/zgsmplay-1.4.ebuild | 23 +++-- 4 files changed, 124 insertions(+), 8 deletions(-) create mode 100644 app-misc/zgsmplay/files/zgsmplay-1.4-makefile.patch diff --git a/app-misc/zgsmplay/ChangeLog b/app-misc/zgsmplay/ChangeLog index 7d83fc8ac..72dcfa0ea 100644 --- a/app-misc/zgsmplay/ChangeLog +++ b/app-misc/zgsmplay/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 09 Apr 2007; Jakub Moc zgsmplay-1.4.ebuild, + +files/zgsmplay-1.4-makefile.patch: + Rewrite from scratch, add ~x86 keyword + 03 Apr 2007; Kevin Fullerton (kfullert) +zgsmplay-1.4.ebuild, +metadata.xml: diff --git a/app-misc/zgsmplay/Manifest b/app-misc/zgsmplay/Manifest index c0ed2a88d..ec21cd500 100644 --- a/app-misc/zgsmplay/Manifest +++ b/app-misc/zgsmplay/Manifest @@ -1,4 +1,5 @@ +AUX zgsmplay-1.4-makefile.patch 2450 RMD160 98cca7d36cd0726ccac52c35648342e7d8d1160d SHA1 b53a5ce918da8f211cc9c9f7c0c23f838a8b4f26 SHA256 a5c89248598c872fbdceb893315d83a0e19966a9ffbf16371a792cd64101e591 DIST zgsmplay-1.4.tar.gz 98589 RMD160 d0a9e32b4adfa40590ef8376d6559d81d9fd5bd0 SHA1 3053d0aaf01ef38b7780f1eb6b67afd91ec0003d SHA256 73995532d0d1c7642957c607d491b6754643df11984f05ccece3b33ea7cf04ec -EBUILD zgsmplay-1.4.ebuild 561 RMD160 f7b666c44ba112bd2355b3ec564e18d539bfa0ae SHA1 d31ace3e7467daac6bba213ea2bfb5f4a40819c0 SHA256 77703388ffb87b6cb398dcf711454275214d39f1eb576ecdc17365ad7b96dbc2 -MISC ChangeLog 266 RMD160 394bbc6f50a09d5aa61ca850c3cd748bfcf71064 SHA1 ff676abc63587fae682f21a187b8c183f141bbc0 SHA256 2d828a05f4d40b877e2bf71a6e84f30d7fe78fd1d3dcbf1f8e05ddc49bde1e16 +EBUILD zgsmplay-1.4.ebuild 796 RMD160 f9aaeb5dd52ca0524d70f65e8bc8cb03dcfc5679 SHA1 81b303452feee8549faeaf762fcae44be8f0c95e SHA256 0bab15e171c2225e00d31a56e4737aad3bb7530b828f6ac3d7fb8e0fe93ffb34 +MISC ChangeLog 411 RMD160 58e6401ec113afc59b1992d225ed781eb7d1ca8f SHA1 45fa30967faa9084f3d0770181cc54db42c7caed SHA256 e6a53e69e3e555345cdf8c6c7585df7b694e93e97049b6d2124b222ae3973a43 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 diff --git a/app-misc/zgsmplay/files/zgsmplay-1.4-makefile.patch b/app-misc/zgsmplay/files/zgsmplay-1.4-makefile.patch new file mode 100644 index 000000000..30ddff466 --- /dev/null +++ b/app-misc/zgsmplay/files/zgsmplay-1.4-makefile.patch @@ -0,0 +1,100 @@ +--- Makefile.orig 2004-12-23 18:17:54.000000000 +0100 ++++ Makefile 2007-04-09 21:37:35.000000000 +0200 +@@ -1,13 +1,13 @@ + # Makefile for zgsmplay + # + # You need an ANSI C compiler; gcc is fine. +-CC=gcc ++CC := gcc + + # Set to where you have the GSM source (this should be ok as-is). + GSMROOT=./gsm-1.0-pl10 + + # Optimisation flags. +-OPTOPT=-O ++OPTOPT += + + # Debug options, comment out if not using gcc. + DEBUGOPT=-Wall +@@ -52,9 +52,9 @@ + + # Change these if needed - they're used by `make install' + # +-PREFIX=/usr/local ++PREFIX=/usr + BINDIR=$(PREFIX)/bin +-MANDIR=$(PREFIX)/man/man1 ++MANDIR=$(PREFIX)/share/man/man1 + + # You shouldn't need to edit below this line. + #-------------------------------------------------------- +@@ -75,11 +75,11 @@ + make -C $(GSMROOT) lib/libgsm.a + + installdirs: +- /bin/sh ./mkinstalldirs $(BINDIR) $(MANDIR) ++ /bin/sh ./mkinstalldirs $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR) + + install: zgsmplay installdirs +- install -s -m 755 zgsmplay $(BINDIR) +- install -m 644 zgsmplay.1 $(MANDIR) ++ install -m 755 zgsmplay $(DESTDIR)$(BINDIR) ++ install -m 644 zgsmplay.1 $(DESTDIR)$(MANDIR) + + # explicitly does /usr/bin to catch pre-1.2 installations + uninstall: +--- gsm-1.0-pl10/Makefile.orig 1999-07-02 14:08:50.000000000 +0200 ++++ gsm-1.0-pl10/Makefile 2007-04-09 21:51:57.000000000 +0200 +@@ -45,13 +45,13 @@ + # CC = /usr/lang/acc + # CCFLAGS = -c -O + +-CC = gcc -ansi -pedantic +-CCFLAGS = -c -O2 -DNeedFunctionPrototypes=1 ++CC := gcc -ansi -pedantic ++CCFLAGS += -ansi -pedantic -c -O2 -DNeedFunctionPrototypes=1 + +-LD = $(CC) ++LD += $(CC) + + # LD = gcc +-# LDFLAGS = ++LDFLAGS += + + + # If your compiler needs additional flags/libraries, regardless of +@@ -73,7 +73,7 @@ + # Leave INSTALL_ROOT empty (or just don't execute "make install") to + # not install gsm and toast outside of this directory. + +-INSTALL_ROOT = /usr/local ++INSTALL_ROOT = /usr + + # Where do you want to install the gsm library, header file, and manpages? + # +@@ -100,14 +100,14 @@ + SHELL = /bin/sh + LN = ln + BASENAME = basename +-AR = ar ++AR += ar + ARFLAGS = cr + RMFLAGS = + FIND = find + COMPRESS = compress + COMPRESSFLAGS = + # RANLIB = true +-RANLIB = ranlib ++RANLIB += ranlib + + # + # You shouldn't have to configure below this line if you're porting. +@@ -302,7 +302,6 @@ + # The basic API: libgsm + + $(LIBGSM): $(LIB) $(GSM_OBJECTS) +- -rm $(RMFLAGS) $(LIBGSM) + $(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS) + $(RANLIB) $(LIBGSM) + + diff --git a/app-misc/zgsmplay/zgsmplay-1.4.ebuild b/app-misc/zgsmplay/zgsmplay-1.4.ebuild index a7b1df27b..62e9a4a37 100644 --- a/app-misc/zgsmplay/zgsmplay-1.4.ebuild +++ b/app-misc/zgsmplay/zgsmplay-1.4.ebuild @@ -2,25 +2,36 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ +inherit eutils toolchain-funcs + DESCRIPTION="Curses-based real-time GSM file player with file selector" HOMEPAGE="http://rus.members.beeb.net/zgsmplay.html" SRC_URI="ftp://ftp.ibiblio.org/pub/Linux/apps/sound/players/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~x86" IUSE="" DEPEND="sys-libs/ncurses" RDEPEND="${DEPEND}" +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-makefile.patch +} + src_compile() { - emake || die "emake failed" + emake \ + CC=$(tc-getCC) \ + AR=$(tc-getAR) \ + RANLIB=$(tc-getRANLIB) \ + OPTOPT="${CFLAGS}" \ + all || die "emake failed" } src_install() { - exeinto /usr/bin - doexe zgsmplay - doman zgsmplay.1 - dodoc NEWS README TODO + emake DESTDIR="${D}" install || die "emake install failed" + dodoc ChangeLog NEWS README TODO } -- cgit v1.2.3