Obey settings of CC and CXX. Update patch from debian to reflect this.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x34E69781

4 files changed, 95 insertions, 103 deletions

diff --git a/media-libs/openctm/ChangeLog b/media-libs/openctm/ChangeLog
index 01d84ddbbc46..46b86d9a8e8b 100644
--- a/media-libs/openctm/ChangeLog
+++ b/media-libs/openctm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/openctm
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openctm/ChangeLog,v 1.1 2014/08/07 16:50:58 amynka Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openctm/ChangeLog,v 1.2 2014/08/10 12:28:12 amynka Exp $
+
+  10 Aug 2014; Amy Winston <amynka@gentoo.org>
+  files/openctm-fix-makefiles.patch, openctm-1.0.3.ebuild:
+  Obey settings of CC and CXX. Update patch from debian to reflect this.
 
 *openctm-1.0.3 (07 Aug 2014)
 
diff --git a/media-libs/openctm/Manifest b/media-libs/openctm/Manifest
index 4c972d1a3a9d..8f45ea6c8dc8 100644
--- a/media-libs/openctm/Manifest
+++ b/media-libs/openctm/Manifest
@@ -1,19 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX openctm-fix-makefiles.patch 6935 SHA256 bae9d7c67c92627882fe91265a0f702622572bedc3d9c8d090c0a82df5035e0d SHA512 3e91ae91b06952537426ec49ba50301eb8cce3de16dd5342a3b0e001f55eb67403bd4c957d13d38dcaf5c646c439954475203d711d300bff0b1cf02f054f26b6 WHIRLPOOL 4398559a12fdb636b9e009b57abf0aa737c517084511fd931f69e6d37e9291e22ea15925be3727c4ae200bdb3c572846390160c4e72bf57ae5a1217f721f56cc
+AUX openctm-fix-makefiles.patch 6908 SHA256 821da3d78579b566bb2e533e3a695ee14491826f79013a4c48e41e9bf36cb9ca SHA512 448a015695f98969320af6b80410f6596bf46b2fba9529637be7e51851552c6056871b1de21e98db01d255db1e71711f78c3e51d161c85dcb52dc5341545be74 WHIRLPOOL 367121b35e450c075d65d7e61730953655f3adefcb9d8f23ce03ac424deb24f45b9a9ba66f269e6707f6e1d481df2d8a7db297f058eeb9568fc549a42eba2d10
 DIST openctm_1.0.3+dfsg1.orig.tar.bz2 179792 SHA256 b72bae806d65dcb4d55b88f17bb636c9908717871cbebff6c32024399f50a074 SHA512 4ea8c9230e01b57fce4d741df77713df8fb0493fbb20c8d4b183e3e8cec16f97e8003d2569b1c7cac07a17d334711673c0fed0c6c050bbdb901028ee9f6c32f6 WHIRLPOOL 954ce30a418fba80649cd2f0eae604391c42a64e627a9d66171097da6fee55fba94229054350dc18cd311cc7d7fb0e1b5a6f9d7db0dce5d91451821df33da5f7
-EBUILD openctm-1.0.3.ebuild 877 SHA256 d5e3aca80180d0e2f1d6b11675012afffbd793bf42928c26cf7d221514f99ec6 SHA512 7ca2872dcfc04e45b6bafb58e8e02dd41aad39e11bcfe9dea8b1b9a90dac58ec52677a4504c2e8640a08c78b66c4555271dcccf33afa907f1581730df872e4f3 WHIRLPOOL 3e3976807ec7b063b8dde4fcb81f839bcfeee3fa2aa144bf38803f87e143e3aab4cc7ec8ca98ffb4038335cffc9304493dc683dfd832d6dc67cb561c4275040f
-MISC ChangeLog 412 SHA256 a7049569de4b5ef5a345e42a157a6e657da50549c2ee59d41129e27a9e4c207a SHA512 b2ebd8dfadd2de6cdbf6f24e981f046f0649617028ceb12c3d37561798996f1b71cbaae630786d99f73aa4aea0b9a472aad24125c10f28c93fa2110717d33c8c WHIRLPOOL 72ef6e18d890fc26431f14d77251bb2af13004cebc5cd260c701f71b2081542f4c606f81732f0e628cce17075099d54f8e0ff90ab9f4db66b0da20d96430cd5c
+EBUILD openctm-1.0.3.ebuild 933 SHA256 6bea5eae12b0241ee4939628b6cd11cf56a4f5b27ce9347bf3777e095016a509 SHA512 0167b984148106affe44061525d7ae9a805624e53485f572180b9e02f37761930c2ce4e3d04cdca827621aad17b28d2e1dcc4a44ae58c068bb7fdd4ba9916569 WHIRLPOOL aeef6e352074e8bff2cf47b5366503ef1097ed06fd6862fe464fe72d4e3d1ad7e4ac19ae892fbb6a01d35bec73fa0e303f116dd4f3e9dc754877bcc960c0b84c
+MISC ChangeLog 592 SHA256 a47151f7e52d4d612ce9d970ebf8f8aa69b0a77c69af833438ee224d9575af5b SHA512 0063acffb0b515aeffb7c1699984425f539fe9d22d7e3c79fb4fc770ea80580b1d973cccd97c8cc35831aa592afa41f87160f27340a2153246b6e6bd731107ee WHIRLPOOL 95c9dfe18529e0d6d6f95c625d144a83f0ca9e6e5c7908a1ab0387def0d1d598a88f32de2d2f5dc5db59aa324d391c9f5c91f0f990981cd7e4350abae2a0e0c3
 MISC metadata.xml 387 SHA256 550d035a4afae6a4a10feb34064dcd602d45c73dc14bd5720ebabfa60f55e978 SHA512 d911c9e829c92e2c8b0d84cd7d3dfebd712a85954695f3f52c659b2d5ffe3a0560dd22008a8f0e0ff3b6c2a1976050fedf1f80ba3eac90fa59425f55b9f8c261 WHIRLPOOL e2a28d3941215cc44a05bc8a7a132af7695cd7951cb19228dd8048765765298f8115dd9fcfc36161dd0128cadaa2b4bc758cc0974bf41ea4ba981fb093d0b597
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJT465zAAoJEDuJ1FA05peBudQH/ApiSFXeZdlU0WC1+Pg8ZnV3
-2fA8dWUecFzkIF7uV+2lK5jh7R9THqy+GByqQiT6FJda43CQ972Es5VEg9UWsuS+
-S88dLPhC1iJTVvcksmmq52JEvpFh2Z1Mfqn8odS6o4pkPXezQImctWPnjrcq/KHf
-mYhJVxJeYtFrTvDD4SWqTttHWTnuL/CuGmPnvf9TbsIzKKbe0Wwz1HRaNlXV+3pt
-qKmh+mfoFt1JA6W8DqT/y4JeaS4VbNc3U0r3/3+yCz0CGQ+L7TRqiTm1qtDKfC81
-fF0PI0lSfbvpTuufViZ/DowWJs37/ReVBI+hepU0BwhYA/wgP9Jy8LuYHBol3sE=
-=fxJJ
+iQEcBAEBCAAGBQJT52VdAAoJEDuJ1FA05peB6VoH/Rblwc/vY8OYBcc0qfbs9Eoa
+D/nZccrSqNqFmOA4upm4kiRbWx63kuEh2YdZJQgrVElIe/Q3FzCqm+m6DAw3eAka
+EeaspZrNG3bpwTMnZad/qxBUahVgWBbe4MrwdF31376rz1AcNPxYL4Y4KaMcDxSH
+Nd7VsrBCl+lL/gZ6FGm1eHhmzBa5ZsV+J5sdYEAcHfCJZrU90U4Pn93Q/Ue9Uw8K
+u3jjZQqXnbCbplKrzBfap6vO+3QDIlYri3hnEzlZfsGNT8nbug6hr/ZasyYK2Tqv
++t0kgb5m+Rr8VeXcX9O7rajmuYxHS7LZPs7hD384MIsol1Yx82HJdYV1RNU7X/8=
+=SFRx
 -----END PGP SIGNATURE-----
diff --git a/media-libs/openctm/files/openctm-fix-makefiles.patch b/media-libs/openctm/files/openctm-fix-makefiles.patch
index ad153f424a0a..5a12862d92d3 100644
--- a/media-libs/openctm/files/openctm-fix-makefiles.patch
+++ b/media-libs/openctm/files/openctm-fix-makefiles.patch
@@ -1,46 +1,20 @@
-Description: Debian changes to Makefiles
-Author: Teemu Ikonen <tpikonen@gmail.com>
-
---- openctm-1.0.3.orig/Makefile.linux
-+++ openctm-1.0.3/Makefile.linux
-@@ -47,19 +47,21 @@ documentation:
- 
- 
- # Installation settings
--LIBDIR  = /usr/lib/
--INCDIR  = /usr/local/include/
--BINDIR  = /usr/local/bin/
--MAN1DIR = /usr/local/share/man/man1/
--CP = cp
-+LIBDIR  = $(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)
-+INCDIR  = $(DESTDIR)/usr/include/
-+BINDIR  = $(DESTDIR)/usr/bin/
-+MAN1DIR = $(DESTDIR)/usr/share/man/man1/
-+CP = cp -P
- MKDIR = mkdir -p
- 
--install:
--	$(CP) lib/libopenctm.so $(LIBDIR)
-+$(LIBDIR) $(INCDIR) $(BINDIR) $(MAN1DIR):
-+	mkdir -p "$@"
-+
-+install: $(LIBDIR) $(INCDIR) $(BINDIR) $(MAN1DIR)
-+	$(CP) lib/libopenctm.so* $(LIBDIR)
- 	$(CP) lib/openctm.h $(INCDIR)
- 	$(CP) lib/openctmpp.h $(INCDIR)
- 	$(CP) tools/ctmconv $(BINDIR)
- 	$(CP) tools/ctmviewer $(BINDIR)
--	$(MKDIR) $(MAN1DIR)
- 	$(CP) doc/ctmconv.1 $(MAN1DIR)
- 	$(CP) doc/ctmviewer.1 $(MAN1DIR)
---- openctm-1.0.3.orig/lib/Makefile.linux
-+++ openctm-1.0.3/lib/Makefile.linux
-@@ -28,12 +28,17 @@
+diff -urN OpenCTM-1.0.3.old/doc/Makefile.linux OpenCTM-1.0.3/doc/Makefile.linux
+--- OpenCTM-1.0.3.old/doc/Makefile.linux	1970-01-01 01:00:00.000000000 +0100
++++ OpenCTM-1.0.3/doc/Makefile.linux	2014-08-10 13:56:45.821979758 +0200
+@@ -0,0 +1,2 @@
++%:
++	true
+diff -urN OpenCTM-1.0.3.old/lib/Makefile.linux OpenCTM-1.0.3/lib/Makefile.linux
+--- OpenCTM-1.0.3.old/lib/Makefile.linux	2014-08-10 13:55:34.090983462 +0200
++++ OpenCTM-1.0.3/lib/Makefile.linux	2014-08-10 13:59:03.312971874 +0200
+@@ -27,13 +27,18 @@
+ ###############################################################################

  

  LZMADIR = liblzma

- CC = gcc

+-CC = gcc

 -CFLAGS = -O3 -W -Wall -c -fPIC -DOPENCTM_BUILD -I$(LZMADIR) -DLZMA_PREFIX_CTM -std=c99 -pedantic

 -CFLAGS_LZMA = -O3 -W -Wall -c -fPIC -DLZMA_PREFIX_CTM -std=c99 -pedantic

++CC ?= gcc

 +CFLAGS += -W -Wall -c -fPIC -std=c99 -pedantic

 +INCDEF = -DOPENCTM_BUILD -I$(LZMADIR) -DLZMA_PREFIX_CTM

 +INCDEF_LZMA = -DLZMA_PREFIX_CTM

@@ -56,7 +30,7 @@ Author: Teemu Ikonen <tpikonen@gmail.com>
  

  OBJS = openctm.o \

         stream.o \

-@@ -64,16 +69,18 @@ LZMA_SRCS = $(LZMADIR)/Alloc.c \
+@@ -64,16 +69,18 @@
  all: $(DYNAMICLIB)

  

  clean:

@@ -65,7 +39,7 @@ Author: Teemu Ikonen <tpikonen@gmail.com>
  

  $(DYNAMICLIB): $(OBJS) $(LZMA_OBJS)

 -	gcc -shared -s -Wl,-soname,$@ -o $@ $(OBJS) $(LZMA_OBJS) -lm

-+	gcc $(LDFLAGS) -shared -s -Wl,-soname,$(SONAME) -o $@ $(OBJS) $(LZMA_OBJS) -lm

++	$(CC) $(LDFLAGS) -shared -s -Wl,-soname,$(SONAME) -o $@ $(OBJS) $(LZMA_OBJS) -lm

 +	ln -s $(DYNAMICLIB) $(SONAME)

 +	ln -s $(DYNAMICLIB) $(LIBNAME)

  

@@ -79,14 +53,43 @@ Author: Teemu Ikonen <tpikonen@gmail.com>
  

  depend:

  	$(DEPEND) $(SRCS) $(LZMA_SRCS) > make.depend

---- /dev/null
-+++ openctm-1.0.3/doc/Makefile.linux
-@@ -0,0 +1,2 @@
-+%:
-+	true
---- openctm-1.0.3.orig/tools/Makefile.linux
-+++ openctm-1.0.3/tools/Makefile.linux
-@@ -26,49 +26,55 @@
+diff -urN OpenCTM-1.0.3.old/Makefile.linux OpenCTM-1.0.3/Makefile.linux
+--- OpenCTM-1.0.3.old/Makefile.linux	2014-08-10 13:55:34.096983462 +0200
++++ OpenCTM-1.0.3/Makefile.linux	2014-08-10 13:56:45.821979758 +0200
+@@ -47,19 +47,21 @@
+ 
+ 
+ # Installation settings
+-LIBDIR  = /usr/lib/
+-INCDIR  = /usr/local/include/
+-BINDIR  = /usr/local/bin/
+-MAN1DIR = /usr/local/share/man/man1/
+-CP = cp
++LIBDIR  = $(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)
++INCDIR  = $(DESTDIR)/usr/include/
++BINDIR  = $(DESTDIR)/usr/bin/
++MAN1DIR = $(DESTDIR)/usr/share/man/man1/
++CP = cp -P
+ MKDIR = mkdir -p
+ 
+-install:
+-	$(CP) lib/libopenctm.so $(LIBDIR)
++$(LIBDIR) $(INCDIR) $(BINDIR) $(MAN1DIR):
++	mkdir -p "$@"
++
++install: $(LIBDIR) $(INCDIR) $(BINDIR) $(MAN1DIR)
++	$(CP) lib/libopenctm.so* $(LIBDIR)
+ 	$(CP) lib/openctm.h $(INCDIR)
+ 	$(CP) lib/openctmpp.h $(INCDIR)
+ 	$(CP) tools/ctmconv $(BINDIR)
+ 	$(CP) tools/ctmviewer $(BINDIR)
+-	$(MKDIR) $(MAN1DIR)
+ 	$(CP) doc/ctmconv.1 $(MAN1DIR)
+ 	$(CP) doc/ctmviewer.1 $(MAN1DIR)
+diff -urN OpenCTM-1.0.3.old/tools/Makefile.linux OpenCTM-1.0.3/tools/Makefile.linux
+--- OpenCTM-1.0.3.old/tools/Makefile.linux	2014-08-10 13:55:34.094983462 +0200
++++ OpenCTM-1.0.3/tools/Makefile.linux	2014-08-10 14:00:52.484964897 +0200
+@@ -26,49 +26,50 @@
  ###############################################################################
  
  OPENCTMDIR = ../lib
@@ -100,15 +103,17 @@ Author: Teemu Ikonen <tpikonen@gmail.com>
 -TINYXMLDIR = tinyxml
 -ZLIBDIR = zlib
 -PNGLITEDIR = pnglite
+-
+-CPP = g++
+-CPPFLAGS = -c -O3 -W -Wall `pkg-config --cflags gtk+-2.0` -I$(OPENCTMDIR) -I$(RPLYDIR) -I$(JPEGDIR) -I$(TINYXMLDIR) -I$(GLEWDIR) -I$(ZLIBDIR) -I$(PNGLITEDIR)
 +# rply in libvxl1-dev is version 1.1, we need v. 1.01
 +#RPLYDIR = /usr/include/vxl/rply
 +#TINYXMLDIR = tinyxml
 +#ZLIBDIR = zlib
 +#PNGLITEDIR = pnglite
- 
--CPP = g++
--CPPFLAGS = -c -O3 -W -Wall `pkg-config --cflags gtk+-2.0` -I$(OPENCTMDIR) -I$(RPLYDIR) -I$(JPEGDIR) -I$(TINYXMLDIR) -I$(GLEWDIR) -I$(ZLIBDIR) -I$(PNGLITEDIR)
-+CXX = g++
++
++CXX ?= g++
++CC ?= gcc
 +CXXFLAGS += -W -Wall `pkg-config --cflags gtk+-2.0` -I$(OPENCTMDIR) -I$(RPLYDIR) -I$(GLEWDIR)
  
  MESHOBJS = mesh.o meshio.o ctm.o ply.o rply.o stl.o 3ds.o dae.o obj.o lwo.o off.o wrl.o
@@ -124,30 +129,22 @@ Author: Teemu Ikonen <tpikonen@gmail.com>
 -	cd $(JPEGDIR) && $(MAKE) -f makefile.linux clean
 -	cd $(TINYXMLDIR) && $(MAKE) -f Makefile.linux clean
 -	cd $(ZLIBDIR) && $(MAKE) -f Makefile.linux clean
-+#	cd $(JPEGDIR) && $(MAKE) -f makefile.linux clean
-+#	cd $(TINYXMLDIR) && $(MAKE) -f Makefile.linux clean
-+#	cd $(ZLIBDIR) && $(MAKE) -f Makefile.linux clean
-+
-+#libopenctm.so: $(OPENCTMDIR)/libopenctm.so
-+#	cp $< $@
-+
+-
+-libopenctm.so: $(OPENCTMDIR)/libopenctm.so
+-	cp $< $@
+ 
+-ctmconv: $(CTMCONVOBJS) $(TINYXMLDIR)/libtinyxml.a libopenctm.so
+-	$(CPP) -s -o $@ -L$(OPENCTMDIR) -L$(TINYXMLDIR) $(CTMCONVOBJS) -Wl,-rpath,. -lopenctm -ltinyxml
 +ctmconv: $(CTMCONVOBJS)
 +	$(CXX) $(LDFLAGS) -s -o $@ -L$(OPENCTMDIR) $(CTMCONVOBJS) -lopenctm -ltinyxml
-+
+ 
+-ctmviewer: $(CTMVIEWEROBJS) $(JPEGDIR)/libjpeg.a $(TINYXMLDIR)/libtinyxml.a $(ZLIBDIR)/libz.a libopenctm.so
+-	$(CPP) -s -o $@ -L$(OPENCTMDIR) -L$(TINYXMLDIR) -L$(JPEGDIR) -L$(ZLIBDIR) $(CTMVIEWEROBJS) -Wl,-rpath,. -lopenctm -ltinyxml -ljpeg -lz -lglut `pkg-config --libs gtk+-2.0`
 +ctmviewer: $(CTMVIEWEROBJS)
 +	$(CXX) $(LDFLAGS) -s -o $@ -L$(OPENCTMDIR) $(CTMVIEWEROBJS) -lopenctm \
 +	-ltinyxml -ljpeg -lpnglite -lz -lGL -lglut -lGLU -lGLEW \
 +	-lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0
  
--libopenctm.so: $(OPENCTMDIR)/libopenctm.so
--	cp $< $@
--
--ctmconv: $(CTMCONVOBJS) $(TINYXMLDIR)/libtinyxml.a libopenctm.so
--	$(CPP) -s -o $@ -L$(OPENCTMDIR) -L$(TINYXMLDIR) $(CTMCONVOBJS) -Wl,-rpath,. -lopenctm -ltinyxml
--
--ctmviewer: $(CTMVIEWEROBJS) $(JPEGDIR)/libjpeg.a $(TINYXMLDIR)/libtinyxml.a $(ZLIBDIR)/libz.a libopenctm.so
--	$(CPP) -s -o $@ -L$(OPENCTMDIR) -L$(TINYXMLDIR) -L$(JPEGDIR) -L$(ZLIBDIR) $(CTMVIEWEROBJS) -Wl,-rpath,. -lopenctm -ltinyxml -ljpeg -lz -lglut `pkg-config --libs gtk+-2.0`
--
 -ctmbench: $(CTMBENCHOBJS) libopenctm.so
 -	$(CPP) -s -o $@ -L$(OPENCTMDIR) $(CTMBENCHOBJS) -Wl,-rpath,. -lopenctm
 +ctmbench: $(CTMBENCHOBJS)
@@ -166,13 +163,12 @@ Author: Teemu Ikonen <tpikonen@gmail.com>
  systimer.o: systimer.cpp systimer.h
  sysdialog_gtk.o: sysdialog_gtk.cpp sysdialog.h
  convoptions.o: convoptions.cpp convoptions.h
-@@ -91,22 +97,22 @@ phong_frag.h: phong.frag bin2c
+@@ -91,22 +92,7 @@
  	./bin2c phong.frag phongFragSrc > $@
  
  bin2c: bin2c.cpp
 -	$(CPP) -Os -W -Wall -o $@ $<
-+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -Os -W -Wall -o $@ $<
- 
+-
 -$(JPEGDIR)/libjpeg.a:
 -	cd $(JPEGDIR) && $(MAKE) -f makefile.linux libjpeg.a
 -
@@ -181,26 +177,14 @@ Author: Teemu Ikonen <tpikonen@gmail.com>
 -
 -glew.o: $(GLEWDIR)/glew.c
 -	gcc -c -Os -W -I$(GLEWDIR) -o $@ $<
-+#$(JPEGDIR)/libjpeg.a:
-+#	cd $(JPEGDIR) && $(MAKE) -f makefile.linux libjpeg.a
-+#
-+#$(ZLIBDIR)/libz.a:
-+#	cd $(ZLIBDIR) && $(MAKE) -f Makefile.linux
-+#
-+#glew.o: $(GLEWDIR)/glew.c
-+#	gcc -c -Os -W -I$(GLEWDIR) -o $@ $<
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -Os -W -Wall -o $@ $<
  
  rply.o: $(RPLYDIR)/rply.c
 -	gcc -c -O2 -W -I$(RPLYDIR) -o $@ $<
 -
 -pnglite.o: $(PNGLITEDIR)/pnglite.c
 -	gcc -c -O2 -W -I$(PNGLITEDIR) -o $@ $<
-+	gcc $(CPPFLAGS) $(CFLAGS) -c -O2 -W -I$(RPLYDIR) -o $@ $<
- 
+-
 -$(TINYXMLDIR)/libtinyxml.a:
 -	cd $(TINYXMLDIR) && $(MAKE) -f Makefile.linux
-+#pnglite.o: $(PNGLITEDIR)/pnglite.c
-+#	gcc -c -O2 -W -I$(PNGLITEDIR) -o $@ $<
-+#
-+#$(TINYXMLDIR)/libtinyxml.a:
-+#	cd $(TINYXMLDIR) && $(MAKE) -f Makefile.linux
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c -O2 -W -I$(RPLYDIR) -o $@ $<
diff --git a/media-libs/openctm/openctm-1.0.3.ebuild b/media-libs/openctm/openctm-1.0.3.ebuild
index 3db3ceb2ae33..383351a33b6a 100644
--- a/media-libs/openctm/openctm-1.0.3.ebuild
+++ b/media-libs/openctm/openctm-1.0.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openctm/openctm-1.0.3.ebuild,v 1.1 2014/08/07 16:50:58 amynka Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openctm/openctm-1.0.3.ebuild,v 1.2 2014/08/10 12:28:12 amynka Exp $
 
 EAPI=5
 
-inherit eutils multilib qt4-r2 versionator
+inherit eutils multilib versionator flag-o-matic
 
 MY_PF=OpenCTM-${PV}
 
@@ -16,8 +16,8 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
-DEPEND="
-        dev-libs/tinyxml
+
+DEPEND="dev-libs/tinyxml
 	media-libs/freeglut
 	media-libs/glew
 	media-libs/pnglite
@@ -35,3 +35,7 @@ src_prepare() {
 		"${S}"/Makefile \
 		"${S}"/*/Makefile.linux || die
 }
+
+src_compile() {
+	emake CC=$(tc-getCC) CXX=$(tc-getCXX)
+}