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 started out of box.

Package-Manager: portage-2.1.6.1/cvs/Linux 2.6.27.7 i686

4 files changed, 509 insertions, 3 deletions

diff --git a/media-libs/yiff/ChangeLog b/media-libs/yiff/ChangeLog
index 8e509de2d412..3ac285242990 100644
--- a/media-libs/yiff/ChangeLog
+++ b/media-libs/yiff/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-libs/yiff
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/yiff/ChangeLog,v 1.15 2007/03/18 13:03:04 nixnut Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/yiff/ChangeLog,v 1.16 2008/12/21 11:44:41 ssuominen Exp $
+
+*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:
+  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
+  started out of box.
 
   18 Mar 2007; nixnut <nixnut@gentoo.org> yiff-2.14.5.ebuild:
   Stable on ppc wrt bug 166143
diff --git a/media-libs/yiff/Manifest b/media-libs/yiff/Manifest
index 0acec2ac2e5c..8a981afada8b 100644
--- a/media-libs/yiff/Manifest
+++ b/media-libs/yiff/Manifest
@@ -1,5 +1,7 @@
+AUX yiff-2.14.5-build-2.patch 13169 RMD160 10f9be7774de23b74aa4ffebc5f329d055cddda6 SHA1 c6bc942e364603871e52dd9bf274f8274454d08a SHA256 17955037d791010864fa4a8e423dbb8ccc99e1a5afe867ebcbcc36129ad8f060
 AUX yiff-2.14.5-build.patch 1542 RMD160 1180d4d48a438e766bf4b0863bba9efd67305497 SHA1 228b67b421840066c2a94ccc341fd93fad7afdbb SHA256 2e43924a6ac123e79ffc893c6c205aec204b2e47113c5f03939d2fab4e2dbd2d
 DIST yiff-2.14.5.tar.bz2 554909 RMD160 13e00937e18e9a746793acdeea88b1d65cd95a8d SHA1 085b4e2a52964eb1c5746e78d2996ddda914fe3b SHA256 229f35e32b76ac398387123a955aa789d614896d9e354e084db872a20a3ad764
+EBUILD yiff-2.14.5-r1.ebuild 1008 RMD160 02a0c68048a1c622856dd9fa9d809eca72874e25 SHA1 6562afb62147482669ca8ae7e75d3fc96186a353 SHA256 c9ec079dc82babf28ce3107b59e075daec6488de41653f2774b6a128e249caa1
 EBUILD yiff-2.14.5.ebuild 1397 RMD160 41086082589ff872beb15d38aaab14e63ceb6575 SHA1 7bf59b7b7f3a287a019e911c56861dc4fabbe383 SHA256 583b531d344c2f19308a1e5e52e88213e4f3e44389458b60474da4334af5049f
-MISC ChangeLog 1817 RMD160 87f2c019450be433f4f55140dbc35630b15e6381 SHA1 80fefae655266f93e1dd5adb205cb8743f6a095b SHA256 7993581743137a66c530e924e5eede0b7ab463c7d84777ee18637d52aaa31692
+MISC ChangeLog 2195 RMD160 3fea2d2485bb0048ba324564c52b39501420439d SHA1 ce818ce36e79846a064e9625592d05b88b3238f8 SHA256 9a97852b1d35fd5d26d657828d7453bb1ba402164fbb3c35a82a8fb01b0d471c
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
diff --git a/media-libs/yiff/files/yiff-2.14.5-build-2.patch b/media-libs/yiff/files/yiff-2.14.5-build-2.patch
new file mode 100644
index 000000000000..6319eefb4da6
--- /dev/null
+++ b/media-libs/yiff/files/yiff-2.14.5-build-2.patch
@@ -0,0 +1,458 @@
+diff -ur yiff-2.14.5.orig/libY2/Makefile yiff-2.14.5/libY2/Makefile
+--- yiff-2.14.5.orig/libY2/Makefile	2005-09-26 11:41:57.000000000 +0300
++++ yiff-2.14.5/libY2/Makefile	2008-12-21 13:17:41.000000000 +0200
+@@ -57,11 +57,11 @@
+ #	-shared			Compile this program as a shared library.
+ #
+ 
+-CFLAGS = -Wall -O2 -g
++CFLAGS += -Wall
+ #CFLAGS = -Wall -O6 -fomit-frame-pointer -funroll-loops \
+ #         -finline-functions -ffast-math -march=i586
+ 
+-CPPFLAGS = -D__cplusplus -Dc_plusplus
++CXXFLAGS += -D__cplusplus -Dc_plusplus
+ 
+ 
+ # ########################################################################
+@@ -103,8 +103,8 @@
+ #
+ include Makefile.srclist
+ 
+-CC = cc
+-CPP = c++
++CC ?= gcc
++CXX ?= g++
+ 
+ # ########################################################################
+ # Utilities:
+@@ -124,9 +124,6 @@
+ LINK      = ln
+ LINKFLAGS = -sf
+ 
+-LDCONFIG = ldconfig
+-
+-
+ # ########################################################################
+ # Build Rules:
+ #
+@@ -134,12 +131,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)
++	+$(CXX) -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)
++	$(CXX) $(OBJ_C) $(OBJ_CPP) -Wl,-soname=$(LIB) -shared -o $(LIB) $(LIBS) $(LIB_DIRS)
+ 	$(LINK) $(LINKFLAGS) $(LIB) $(LIBPFX).so
+ 
+ all: $(LIB)
+@@ -149,9 +146,9 @@
+ #
+ 
+ INSTALL      = install
+-INSTBINFLAGS = -m 0755 -s
++INSTBINFLAGS = -m 0755
+ INSTUIDFLAGS = -m 4755
+-INSTLIBFLAGS = -m 0755 -s
++INSTLIBFLAGS = -m 0755
+ INSTINCFLAGS = -m 0644
+ INSTMANFLAGS = -m 0644
+ INSTCFGFLAGS = -m 0644
+@@ -159,7 +156,7 @@
+ 
+ YLIB_DIR = $(PREFIX)/lib
+ YINC_DIR = $(PREFIX)/include/Y2
+-YMAN_DIR = $(PREFIX)/man/man3
++YMAN_DIR = $(PREFIX)/share/man/man3
+ 
+ 
+ install_lib:
+@@ -237,8 +234,6 @@
+ 	$(MKDIR) $(MKDIRFLAGS) $(YMAN_DIR)
+ 	$(INSTALL) $(INSTMANFLAGS) man/* $(YMAN_DIR)
+ 
+-	-$(LDCONFIG)
+-
+ 	@echo "-------------------------------------------------------------------------"
+ 	@echo "Library $(LIB) installed in:"
+ 	@echo " "
+diff -ur yiff-2.14.5.orig/libY2/Makefile.Linux yiff-2.14.5/libY2/Makefile.Linux
+--- yiff-2.14.5.orig/libY2/Makefile.Linux	2005-09-26 11:41:57.000000000 +0300
++++ yiff-2.14.5/libY2/Makefile.Linux	2008-12-21 13:18:06.000000000 +0200
+@@ -57,11 +57,11 @@
+ #	-shared			Compile this program as a shared library.
+ #
+ 
+-CFLAGS = -Wall -O2 -g
++CFLAGS += -Wall
+ #CFLAGS = -Wall -O6 -fomit-frame-pointer -funroll-loops \
+ #         -finline-functions -ffast-math -march=i586
+ 
+-CPPFLAGS = -D__cplusplus -Dc_plusplus
++CXXFLAGS += -D__cplusplus -Dc_plusplus
+ 
+ 
+ # ########################################################################
+@@ -103,8 +103,8 @@
+ #
+ include Makefile.srclist
+ 
+-CC = cc
+-CPP = c++
++CC ?= gcc
++CXX ?= g++
+ 
+ # ########################################################################
+ # Utilities:
+@@ -124,9 +124,6 @@
+ LINK      = ln
+ LINKFLAGS = -sf
+ 
+-LDCONFIG = ldconfig
+-
+-
+ # ########################################################################
+ # Build Rules:
+ #
+@@ -134,12 +131,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)
++	+$(CXX) -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)
++	$(CXX) $(OBJ_C) $(OBJ_CPP) -Wl,-soname=$(LIB) -shared -o $(LIB) $(LIBS) $(LIB_DIRS)
+ 	$(LINK) $(LINKFLAGS) $(LIB) $(LIBPFX).so
+ 
+ all: $(LIB)
+@@ -149,9 +146,9 @@
+ #
+ 
+ INSTALL      = install
+-INSTBINFLAGS = -m 0755 -s
++INSTBINFLAGS = -m 0755
+ INSTUIDFLAGS = -m 4755
+-INSTLIBFLAGS = -m 0755 -s
++INSTLIBFLAGS = -m 0755
+ INSTINCFLAGS = -m 0644
+ INSTMANFLAGS = -m 0644
+ INSTCFGFLAGS = -m 0644
+@@ -159,7 +156,7 @@
+ 
+ YLIB_DIR = $(PREFIX)/lib
+ YINC_DIR = $(PREFIX)/include/Y2
+-YMAN_DIR = $(PREFIX)/man/man3
++YMAN_DIR = $(PREFIX)/share/man/man3
+ 
+ 
+ install_lib:
+@@ -237,8 +234,6 @@
+ 	$(MKDIR) $(MKDIRFLAGS) $(YMAN_DIR)
+ 	$(INSTALL) $(INSTMANFLAGS) man/* $(YMAN_DIR)
+ 
+-	-$(LDCONFIG)
+-
+ 	@echo "-------------------------------------------------------------------------"
+ 	@echo "Library $(LIB) installed in:"
+ 	@echo " "
+diff -ur yiff-2.14.5.orig/Makefile yiff-2.14.5/Makefile
+--- yiff-2.14.5.orig/Makefile	2003-07-21 00:19:39.000000000 +0300
++++ yiff-2.14.5/Makefile	2008-12-21 13:25:00.000000000 +0200
+@@ -3,8 +3,8 @@
+ #                           Toplevel Makefile
+ #
+ 
+-ALL_DIRS=stuff libY2 yiff yiffconfig yiffutils
+-LINUX_DIRS=libY2 yiff yiffconfig yiffutils
++ALL_DIRS=stuff libY2 yiff yiffutils
++LINUX_DIRS=libY2 yiff yiffutils
+ LINUX_NOSERVER_DIRS=libY2 yiffutils
+ 
+ #
+@@ -13,13 +13,13 @@
+ 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:
+ 	for subdir in $(LINUX_NOSERVER_DIRS); do			\
+ 	  LIB_DIR=-L../libY2;						\
+-	  $(MAKE) -C $$subdir -f Makefile.Linux all;			\
++	  $(MAKE) -C $$subdir -f Makefile.Linux all || exit 1;		\
+ 	done
+ 
+ #
+diff -ur yiff-2.14.5.orig/stuff/Makefile yiff-2.14.5/stuff/Makefile
+--- yiff-2.14.5.orig/stuff/Makefile	2003-07-21 00:46:35.000000000 +0300
++++ yiff-2.14.5/stuff/Makefile	2008-12-21 13:29:03.000000000 +0200
+@@ -34,10 +34,11 @@
+ INSTCFGFLAGS = -m 0644
+ INSTDATFLAGS = -m 0644
+ 
+-ICONS_DIR  = share/icons
+-SOUNDS_DIR = share/sounds
++ICONS_DIR  = share/pixmaps
++SOUNDS_DIR = share/yiff/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 -ur yiff-2.14.5.orig/yiff/config.h yiff-2.14.5/yiff/config.h
+--- yiff-2.14.5.orig/yiff/config.h	2005-09-26 11:41:59.000000000 +0300
++++ yiff-2.14.5/yiff/config.h	2008-12-21 13:37:28.000000000 +0200
+@@ -14,7 +14,7 @@
+  *	Full path to the YIFF Sound Server configuration file, it
+  *	can also be specified from the command line at run time
+  */
+-#define DEF_RCFILE_NAME		"/usr/etc/yiffrc"
++#define DEF_RCFILE_NAME		"/etc/yiffrc"
+ /* #define DEF_RCFILE_NAME	"/etc/yiff.conf" */
+ /* #define DEF_RCFILE_NAME	"/usr/etc/YIFFConfig" */
+ 
+diff -ur yiff-2.14.5.orig/yiff/Makefile yiff-2.14.5/yiff/Makefile
+--- yiff-2.14.5.orig/yiff/Makefile	2005-09-26 11:41:59.000000000 +0300
++++ yiff-2.14.5/yiff/Makefile	2008-12-21 13:20:10.000000000 +0200
+@@ -85,10 +85,8 @@
+ #         -D__USE_BSD -Wall -O6 \
+ #         -fomit-frame-pointer -funroll-loops -finline-functions \
+ #         -ffast-math
+-CFLAGS = -DALSA_RUN_CONFORM -DOSS -DOSS_BUFFRAG -DYSHM_SUPPORT \
+-         -D__USE_BSD -Wall -O6 \
+-         -fomit-frame-pointer -funroll-loops -finline-functions \
+-         -ffast-math
++CFLAGS += -DOSS -DOSS_BUFFRAG -DYSHM_SUPPORT \
++         -D__USE_BSD
+ #CFLAGS = -DALSA_RUN_CONFORM -DOSS -DOSS_BUFFRAG -DYSHM_SUPPORT \
+ #        -D__USE_BSD -Wall -O -g
+ #CFLAGS = -DALSA_RUN_CONFORM -DOSS -DOSS_BUFFRAG -DYSHM_SUPPORT \
+@@ -96,7 +94,7 @@
+ #         -fomit-frame-pointer -funroll-loops -finline-functions \
+ #         -ffast-math -march=i586
+ 
+-CPPFLAGS = -Dc_plusplus -D__cplusplus
++CXXFLAGS += -Dc_plusplus -D__cplusplus
+ 
+ 
+ # ########################################################################
+@@ -138,15 +136,15 @@
+ # Program Source and Header Files:
+ #
+ include Makefile.srclist
+-CC  = cc
+-CPP = c++
++CC  ?= gcc
++CXX ?= g++
+ BIN = yiff
+ OBJ_C = $(SRC_C:.c=.o)
+ OBJ_CPP = $(SRC_CPP:.cpp=.o)
+ .c.o:
+ 	$(CC) -c $*.c $(INC) $(CFLAGS)
+ .cpp.o:
+-	$(CPP) -c $*.cpp $(INC) $(CFLAGS) $(CPPFLAGS)
++	$(CXX) -c $*.cpp $(INC) $(CFLAGS) $(CPPFLAGS)
+ 
+ RM      = rm
+ RMFLAGS = -f
+@@ -158,7 +156,7 @@
+ # Build Rules:
+ #
+ $(BIN): $(OBJ_C) $(OBJ_CPP)
+-	$(CPP) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIB) $(LIB_DIR)
++	$(CXX) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIB) $(LIB_DIR)
+ 
+ all: $(BIN)
+ 
+diff -ur yiff-2.14.5.orig/yiff/Makefile.install.UNIX yiff-2.14.5/yiff/Makefile.install.UNIX
+--- yiff-2.14.5.orig/yiff/Makefile.install.UNIX	2005-09-26 11:41:59.000000000 +0300
++++ yiff-2.14.5/yiff/Makefile.install.UNIX	2008-12-21 13:20:40.000000000 +0200
+@@ -10,9 +10,9 @@
+ #       PREFIX
+ #
+ INSTALL      = install
+-INSTBINFLAGS = -m 0755 -s
++INSTBINFLAGS = -m 0755
+ INSTUIDFLAGS = -m 4755
+-INSTLIBFLAGS = -m 0755 -s
++INSTLIBFLAGS = -m 0755
+ INSTINCFLAGS = -m 0644
+ INSTMANFLAGS = -m 0644
+ INSTCFGFLAGS = -m 0644
+@@ -25,7 +25,7 @@
+ MKDIRFLAGS = -p
+ 
+ ETC_DIR = $(PREFIX)/etc
+-MAN_DIR = $(PREFIX)/man/man8
++MAN_DIR = $(PREFIX)/share/man/man8
+ SBIN_DIR = $(PREFIX)/sbin
+ 
+ CONFIG_FILE = yiffrc
+diff -ur yiff-2.14.5.orig/yiff/Makefile.Linux yiff-2.14.5/yiff/Makefile.Linux
+--- yiff-2.14.5.orig/yiff/Makefile.Linux	2005-09-26 11:41:59.000000000 +0300
++++ yiff-2.14.5/yiff/Makefile.Linux	2008-12-21 13:21:50.000000000 +0200
+@@ -85,10 +85,7 @@
+ #         -D__USE_BSD -Wall -O6 \
+ #         -fomit-frame-pointer -funroll-loops -finline-functions \
+ #         -ffast-math
+-CFLAGS = -DALSA_RUN_CONFORM -DOSS -DOSS_BUFFRAG -DYSHM_SUPPORT \
+-         -D__USE_BSD -Wall -O6 \
+-         -fomit-frame-pointer -funroll-loops -finline-functions \
+-         -ffast-math
++CFLAGS += -DOSS -DOSS_BUFFRAG -DYSHM_SUPPORT -D__USE_BSD
+ #CFLAGS = -DALSA_RUN_CONFORM -DOSS -DOSS_BUFFRAG -DYSHM_SUPPORT \
+ #        -D__USE_BSD -Wall -O -g
+ #CFLAGS = -DALSA_RUN_CONFORM -DOSS -DOSS_BUFFRAG -DYSHM_SUPPORT \
+@@ -96,7 +93,7 @@
+ #         -fomit-frame-pointer -funroll-loops -finline-functions \
+ #         -ffast-math -march=i586
+ 
+-CPPFLAGS = -Dc_plusplus -D__cplusplus
++CXXFLAGS += -Dc_plusplus -D__cplusplus
+ 
+ 
+ # ########################################################################
+@@ -138,15 +135,15 @@
+ # Program Source and Header Files:
+ #
+ include Makefile.srclist
+-CC  = cc
+-CPP = c++
++CC  ?= gcc
++CXX ?= g++
+ BIN = yiff
+ OBJ_C = $(SRC_C:.c=.o)
+ OBJ_CPP = $(SRC_CPP:.cpp=.o)
+ .c.o:
+ 	$(CC) -c $*.c $(INC) $(CFLAGS)
+ .cpp.o:
+-	$(CPP) -c $*.cpp $(INC) $(CFLAGS) $(CPPFLAGS)
++	$(CXX) -c $*.cpp $(INC) $(CFLAGS) $(CPPFLAGS)
+ 
+ RM      = rm
+ RMFLAGS = -f
+@@ -158,7 +155,7 @@
+ # Build Rules:
+ #
+ $(BIN): $(OBJ_C) $(OBJ_CPP)
+-	$(CPP) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIB) $(LIB_DIR)
++	$(CXX) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIB) $(LIB_DIR)
+ 
+ all: $(BIN)
+ 
+diff -ur yiff-2.14.5.orig/yiff/yiffrc yiff-2.14.5/yiff/yiffrc
+--- yiff-2.14.5.orig/yiff/yiffrc	2005-09-26 11:41:59.000000000 +0300
++++ yiff-2.14.5/yiff/yiffrc	2008-12-21 13:39:24.000000000 +0200
+@@ -291,7 +291,11 @@
+ #
+ 
+ BeginYSoundPath
+-    Path = /usr/share/sounds
++    Path = /usr/share/yiff/sounds
++EndYSoundPath
++
++BeginYSoundPath
++    Path = /usr/share/yiff
+ EndYSoundPath
+ 
+ BeginYSoundPath
+diff -ur yiff-2.14.5.orig/yiffutils/Makefile yiff-2.14.5/yiffutils/Makefile
+--- yiff-2.14.5.orig/yiffutils/Makefile	2005-09-26 11:41:57.000000000 +0300
++++ yiff-2.14.5/yiffutils/Makefile	2008-12-21 13:27:46.000000000 +0200
+@@ -48,7 +48,7 @@
+ #                               to debug the program.
+ #
+ 
+-CFLAGS = -Wall -O2 -g
++CFLAGS += -Wall
+ #CFLAGS = -Wall -O2 \
+ #         -fomit-frame-pointer -funroll-loops -finline-functions \
+ #         -ffast-math -march=i586
+@@ -92,8 +92,8 @@
+ #
+ PROGS  = helloworld yaudiocd yclientmessage yhost ymixer yplay \
+          yrecinfo yset yshutdown
+-CC     = cc
+-CPP    = c++
++CC     ?= gcc
++CXX    ?= g++
+ 
+ 
+ # ########################################################################
+@@ -164,16 +164,16 @@
+ MKDIR        = mkdir
+ MKDIRFLAGS   = -p
+ 
+-INSTBINFLAGS = -m 0755 -s
++INSTBINFLAGS = -m 0755
+ INSTUIDFLAGS = -m 4755
+-INSTLIBFLAGS = -m 0755 -s
++INSTLIBFLAGS = -m 0755
+ INSTINCFLAGS = -m 0644
+ INSTMANFLAGS = -m 0644
+ INSTCFGFLAGS = -m 0644
+ INSTDATFLAGS = -m 0644
+ 
+ BIN_DIR = $(PREFIX)/bin
+-MAN_DIR = $(PREFIX)/man/man1
++MAN_DIR = $(PREFIX)/share/man/man1
+ 
+ install:
+ 	$(MKDIR) $(MKDIRFLAGS) $(BIN_DIR)
+diff -ur yiff-2.14.5.orig/yiffutils/Makefile.Linux yiff-2.14.5/yiffutils/Makefile.Linux
+--- yiff-2.14.5.orig/yiffutils/Makefile.Linux	2005-09-26 11:41:57.000000000 +0300
++++ yiff-2.14.5/yiffutils/Makefile.Linux	2008-12-21 13:27:54.000000000 +0200
+@@ -48,7 +48,7 @@
+ #                               to debug the program.
+ #
+ 
+-CFLAGS = -Wall -O2 -g
++CFLAGS += -Wall
+ #CFLAGS = -Wall -O2 \
+ #         -fomit-frame-pointer -funroll-loops -finline-functions \
+ #         -ffast-math -march=i586
+@@ -92,8 +92,8 @@
+ #
+ PROGS  = helloworld yaudiocd yclientmessage yhost ymixer yplay \
+          yrecinfo yset yshutdown
+-CC     = cc
+-CPP    = c++
++CC     ?= gcc
++CXX    ?= g++
+ 
+ 
+ # ########################################################################
+@@ -164,16 +164,16 @@
+ MKDIR        = mkdir
+ MKDIRFLAGS   = -p
+ 
+-INSTBINFLAGS = -m 0755 -s
++INSTBINFLAGS = -m 0755
+ INSTUIDFLAGS = -m 4755
+-INSTLIBFLAGS = -m 0755 -s
++INSTLIBFLAGS = -m 0755
+ INSTINCFLAGS = -m 0644
+ INSTMANFLAGS = -m 0644
+ INSTCFGFLAGS = -m 0644
+ INSTDATFLAGS = -m 0644
+ 
+ BIN_DIR = $(PREFIX)/bin
+-MAN_DIR = $(PREFIX)/man/man1
++MAN_DIR = $(PREFIX)/share/man/man1
+ 
+ install:
+ 	$(MKDIR) $(MKDIRFLAGS) $(BIN_DIR)
diff --git a/media-libs/yiff/yiff-2.14.5-r1.ebuild b/media-libs/yiff/yiff-2.14.5-r1.ebuild
new file mode 100644
index 000000000000..fae2a840f57d
--- /dev/null
+++ b/media-libs/yiff/yiff-2.14.5-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2008 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.1 2008/12/21 11:44:41 ssuominen Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="alsa"
+
+DEPEND="alsa? ( media-libs/alsa-lib )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-build-2.patch
+	sed -i -e "/^YLIB_DIR/s:/lib:/$(get_libdir):" \
+		*/Makefile* || die "sed	failed."
+}
+
+src_compile() {
+	tc-export CC CXX
+	use alsa && append-flags -DALSA_RUN_CONFORM
+	emake linux || die "emake failed."
+}
+
+src_install() {
+	emake PREFIX="${D}"/usr install || die "emake install failed."
+	dodoc AUTHORS README
+	insinto /etc
+	doins yiff/yiffrc || die "doins failed."
+}