amd64 stable wrt #267924

(Portage version: 2.1.6.13/cvs/Linux x86_64)

5 files changed, 18 insertions, 114 deletions

diff --git a/media-libs/yiff/ChangeLog b/media-libs/yiff/ChangeLog
index c18d884640cc..f97424c157a7 100644
--- a/media-libs/yiff/ChangeLog
+++ b/media-libs/yiff/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/yiff
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/yiff/ChangeLog,v 1.18 2009/05/02 19:29:49 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/yiff/ChangeLog,v 1.19 2009/05/10 08:25:16 ssuominen Exp $
+
+  10 May 2009; Samuli Suominen <ssuominen@gentoo.org> -yiff-2.14.5.ebuild,
+  yiff-2.14.5-r1.ebuild, -files/yiff-2.14.5-build.patch:
+  amd64 stable wrt #267924
 
   02 May 2009; Raúl Porcel <armin76@gentoo.org> yiff-2.14.5-r1.ebuild:
   sparc/x86 stable wrt #267924
@@ -10,8 +14,8 @@
 
 *yiff-2.14.5-r1 (21 Dec 2008)
 
-  21 Dec 2008; <ssuominen@gentoo.org> +files/yiff-2.14.5-build-2.patch,
-  +yiff-2.14.5-r1.ebuild:
+  21 Dec 2008; Samuli Suominen <ssuominen@gentoo.org>
+  +files/yiff-2.14.5-build-2.patch, +yiff-2.14.5-r1.ebuild:
   Don't install yiffconfig which is GTK+-1.2. Don't install support for KDE
   3, kmid. Respect CC, CXX, CFLAGS and CXXFLAGS. Remove unnecessary RESTRICT
   for strip from ebuild. Install default yiffrc so yiff server can be
diff --git a/media-libs/yiff/files/yiff-2.14.5-build.patch b/media-libs/yiff/files/yiff-2.14.5-build.patch
deleted file mode 100644
index 0c9f0015901e..000000000000
--- a/media-libs/yiff/files/yiff-2.14.5-build.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- yiffconfig/Makefile
-+++ yiffconfig/Makefile
-@@ -49,7 +49,7 @@
- #				to debug the program.
- #
- 
--CFLAGS = `gtk-config --cflags` -Wall -O2 -g
-+CFLAGS += `gtk-config --cflags` -Wall
- #CFLAGS = `gtk-config --cflags` -Wall -O6 \
- #         -fomit-frame-pointer -funroll-loops -finline-functions \
- #         -ffast-math -march=i586
---- libY2/Makefile.Linux
-+++ libY2/Makefile.Linux
-@@ -134,12 +134,12 @@
- OBJ_C   = $(SRC_C:.c=.o)
- OBJ_CPP = $(SRC_CPP:.cpp=.o)
- .c.o:
--	+$(CC) -c $*.c $(INC_DIRS) $(CFLAGS)
-+	+$(CC) -c $*.c $(INC_DIRS) $(CFLAGS) -fPIC
- .cpp.o:
--	+$(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS)
-+	+$(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS) -fPIC
- 
- $(LIB): $(OBJ_C) $(OBJ_CPP)
--	$(CC) $(OBJ_C) $(OBJ_CPP) -Wl,-soname=$(LIB) -shared -o $(LIB) $(LIBS) $(LIB_DIRS)
-+	$(CPP) $(OBJ_C) $(OBJ_CPP) -Wl,-soname=$(LIB) -shared -o $(LIB) $(LIBS) $(LIB_DIRS)
- 	$(LINK) $(LINKFLAGS) $(LIB) $(LIBPFX).so
- 
- all: $(LIB)
---- Makefile
-+++ Makefile
-@@ -13,7 +13,7 @@
- linux:
- 	for subdir in $(LINUX_DIRS); do					\
- 	  LIB_DIR=-L../libY2;						\
--	  $(MAKE) -C $$subdir -f Makefile.Linux all; 			\
-+	  $(MAKE) -C $$subdir -f Makefile.Linux all || exit 1; 			\
- 	done
- 
- linux_noserver:
---- stuff/Makefile
-+++ stuff/Makefile
-@@ -38,6 +38,7 @@
- SOUNDS_DIR = share/sounds
- 
- install:
-+	$(INSTALL) -m 755 -d $(PREFIX)/$(ICONS_DIR) $(PREFIX)/$(SOUNDS_DIR)
- 	$(INSTALL) $(INSTDATFLAGS) Y.xpm $(PREFIX)/$(ICONS_DIR)
- 	$(INSTALL) $(INSTDATFLAGS) yiff.xpm $(PREFIX)/$(ICONS_DIR)
- 	$(INSTALL) $(INSTDATFLAGS) yiff.wav $(PREFIX)/$(SOUNDS_DIR)
diff --git a/media-libs/yiff/metadata.xml b/media-libs/yiff/metadata.xml
index e1774e3d9ad7..ae573a60407f 100644
--- a/media-libs/yiff/metadata.xml
+++ b/media-libs/yiff/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+	<herd>sound</herd>
 </pkgmetadata>
diff --git a/media-libs/yiff/yiff-2.14.5-r1.ebuild b/media-libs/yiff/yiff-2.14.5-r1.ebuild
index a0070a68e9f4..6af3a1e860d2 100644
--- a/media-libs/yiff/yiff-2.14.5-r1.ebuild
+++ b/media-libs/yiff/yiff-2.14.5-r1.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/yiff/yiff-2.14.5-r1.ebuild,v 1.3 2009/05/02 19:29:49 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/yiff/yiff-2.14.5-r1.ebuild,v 1.4 2009/05/10 08:25:16 ssuominen Exp $
 
+EAPI=2
 inherit eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="high performance and stable sound server for UNIX games and apps"
@@ -10,28 +11,27 @@ SRC_URI="ftp://wolfpack.twu.net/users/wolfpack/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc sparc x86"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE="alsa"
 
-DEPEND="alsa? ( media-libs/alsa-lib )"
+RDEPEND="alsa? ( media-libs/alsa-lib )"
+DEPEND="${RDEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-build-2.patch
 	sed -i -e "/^YLIB_DIR/s:/lib:/$(get_libdir):" \
-		*/Makefile* || die "sed	failed."
+		*/Makefile* || die "sed	failed"
 }
 
 src_compile() {
 	tc-export CC CXX
 	use alsa && append-flags -DALSA_RUN_CONFORM
-	emake linux || die "emake failed."
+	emake linux || die "emake failed"
 }
 
 src_install() {
-	emake PREFIX="${D}"/usr install || die "emake install failed."
+	emake PREFIX="${D}"/usr install || die "emake install failed"
 	dodoc AUTHORS README
 	insinto /etc
-	doins yiff/yiffrc || die "doins failed."
+	doins yiff/yiffrc || die "doins failed"
 }
diff --git a/media-libs/yiff/yiff-2.14.5.ebuild b/media-libs/yiff/yiff-2.14.5.ebuild
deleted file mode 100644
index b25a76e02071..000000000000
--- a/media-libs/yiff/yiff-2.14.5.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/yiff/yiff-2.14.5.ebuild,v 1.7 2007/03/18 13:03:04 nixnut Exp $
-
-inherit flag-o-matic eutils kde-functions
-
-DESCRIPTION="high performance and stable sound server for UNIX games and apps"
-HOMEPAGE="http://wolfpack.twu.net/YIFF/"
-SRC_URI="ftp://wolfpack.twu.net/users/wolfpack/${P}.tar.bz2"
-RESTRICT="strip"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE="alsa gtk kde"
-
-DEPEND="gtk? ( =x11-libs/gtk+-1.2* )
-	alsa? ( media-libs/alsa-lib )
-	kde? ( || ( kde-base/kmid kde-base/kdemultimedia ) )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-build.patch
-	if use kde; then
-		set-kdedir
-		sed -i "/^LIB =/s:$: -L${KDEDIR}/lib -lkmid:" yiff/Makefile.Linux
-	fi
-	sed -i \
-		-e "/^YLIB_DIR/s:/lib:/$(get_libdir):" \
-		-e '/LDCONFIG/s:=.*:=true:' \
-		-e '/MAN_DIR/s:/man/:/share/man/:' \
-		*/Makefile* || die
-}
-
-src_compile() {
-	local pkgs="libY2 yiff yiffutils"
-	use gtk && pkgs="${pkgs} yiffconfig"
-	use kde && append-flags -DHAVE_LIBKMID -I${KDEDIR}/include
-	use alsa && append-flags -DALSA_RUN_CONFORM
-	append-flags -DOSS -DOSS_BUFFRAG -DYSHM_SUPPORT -D__USE_BSD
-	emake linux \
-		CFLAGS="${CFLAGS}" \
-		LINUX_DIRS="${pkgs}" \
-		|| die
-}
-
-src_install() {
-	make install PREFIX="${D}"/usr || die
-	dodoc AUTHORS README
-}