Respect CXX, CXXFLAGS and LDFLAGS wrt -build.patch. Mark stable for amd64 (following others). Fix HOMEPAGE wrt #416187 by "df".

Package-Manager: portage-2.2.0_alpha105/cvs/Linux x86_64

4 files changed, 86 insertions, 19 deletions

diff --git a/x11-misc/mixer_app/ChangeLog b/x11-misc/mixer_app/ChangeLog
index 1d940e2bd225..aac1a0c985c2 100644
--- a/x11-misc/mixer_app/ChangeLog
+++ b/x11-misc/mixer_app/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/mixer_app
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/mixer_app/ChangeLog,v 1.19 2007/07/22 03:59:10 dberkholz Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/mixer_app/ChangeLog,v 1.20 2012/05/16 03:36:12 ssuominen Exp $
+
+  16 May 2012; Samuli Suominen <ssuominen@gentoo.org> mixer_app-1.8.0.ebuild,
+  +files/mixer_app-1.8.0-build.patch:
+  Respect CXX, CXXFLAGS and LDFLAGS wrt -build.patch. Mark stable for amd64
+  (following others). Fix HOMEPAGE wrt #416187 by "df".
 
   22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
   mixer_app-1.8.0.ebuild:
diff --git a/x11-misc/mixer_app/Manifest b/x11-misc/mixer_app/Manifest
index 56d089409c4c..c9e824e757a2 100644
--- a/x11-misc/mixer_app/Manifest
+++ b/x11-misc/mixer_app/Manifest
@@ -1,4 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX mixer_app-1.8.0-build.patch 1018 RMD160 fc9ef1fdb1ebe4de35438dbdb771a96493729ff2 SHA1 871c1735a76e3b56945397562eebe03966c270b0 SHA256 97c1aa5d41cd8b340aaf724a5c1c9c33a2f5a5ccf13c4cd49d96e7fb6b3e7f97
 DIST Mixer.app-1.8.0.tar.gz 37884 RMD160 ae29a9b6c4a3d37d48f5e2b936ac62b81cc02c52 SHA1 68b644e2b13fe4a89461cf28ab6aebbcaedc0552 SHA256 223c08d91fd7930d6a97cea376b99fb0118cdea12406c7d62d17d38276b4dd15
-EBUILD mixer_app-1.8.0.ebuild 865 RMD160 38912d66bb3b6592d40bded5ea5766be5267c826 SHA1 fdbdcda39487b06ee40c7e0656b5fc5d9d363acd SHA256 2ea8a9a19722a07a22fbce7b0c1f6828eb6fd41dcba21dd87a706e1f51151854
-MISC ChangeLog 1990 RMD160 d496d6e9369bb32ee2f5fd86bde13a38341b8f16 SHA1 8efaee372d92e2b2546a370e9fb2dca1c8a86ed6 SHA256 23125f7ebb8fee9c964e56bba9a3da084dd9a638846b26a18809e17e289893d4
+EBUILD mixer_app-1.8.0.ebuild 804 RMD160 66cac01acbaebe7e8f9c90a491dda2e52ac4bfec SHA1 6d964b1349e7bc0c26c7372cbb6b3da1868536b5 SHA256 6bf6813f9a668944d39259af22d65add21878fcbfb6ae8048b1643131a5a0a0b
+MISC ChangeLog 2239 RMD160 4a8b85481f89774d003e0ed1ac8dd60e065b2f19 SHA1 476f23193983946e4abc6da20f977ff1a261332e SHA256 a6f0632fc569c35b7c74a5792d062a910f46981ef98e86794ce66f946c3cbacc
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPsyAJAAoJEEdUh39IaPFN53EH/3Wpb2VLXuN3aa1homwqTEmH
+cr2b5fU9MazM8rIv/wHnhjFRmI0dBoB9elpJDhdrwgZsEEAeapr9nONA2JZ9Jq+a
+OWyGuTwhOPytoSkhCk18I3af+k1W030PpiKF6l4lna8eYE4uMHsOdkI3DHdTmSRP
+BG4G6QH6UN03DFPT+gd8EcYrTsYscAv23jsuwdRkQgQhF738M1MftGO5EiTBk1uP
+SEnD7JwFPdT5QubFQpKFm9Pz1Cc+6j0Io28NWGupUGGeC7RIgitsxo0gSG6I08dr
+r1gemVbT7jCnLe0IulQ+WE+69s4zPy/w97BRH1cyDc/SNqLGQzHRwoRkB0Cr9oY=
+=t2oc
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/mixer_app/files/mixer_app-1.8.0-build.patch b/x11-misc/mixer_app/files/mixer_app-1.8.0-build.patch
new file mode 100644
index 000000000000..f36ea6e78ec6
--- /dev/null
+++ b/x11-misc/mixer_app/files/mixer_app-1.8.0-build.patch
@@ -0,0 +1,44 @@
+--- Makefile
++++ Makefile
+@@ -2,32 +2,24 @@
+ # Mixer.app Makefile
+ #
+ 
+-DESTDIR =
+-GNUSTEP_BINDIR = /usr/local/GNUstep/Apps/Mixer.app
+-X11_BINDIR = /usr/X11R6/bin
+-
+-CXX=c++
+-CXXFLAGS += -Wall -pedantic -fno-rtti -fno-exceptions -O2 -I/usr/X11R6/include
+-LDFLAGS += -L/usr/X11R6/lib -lXpm -lXext -lX11
++BINDIR = /usr/bin
++
++CXX ?= g++
++CXXFLAGS += -Wall -pedantic -fno-rtti -fno-exceptions
++LIBS = -lXpm -lXext -lX11
+ 
+ OBJECTS = Main.o Mixer.o Xpm.o
+ 
+ all: Mixer.app
+ 
+ Mixer.app: $(OBJECTS)
+-	$(CXX) $(OBJECTS) -o $@ $(LDFLAGS)
++	$(CXX) $(LDFLAGS) $(OBJECTS) -o $@ $(LIBS)
+ 
+ .PHONY:	install clean distclean
+ 
+-install: install-gnustep
+-
+-install-gnustep: all
+-	install -d  $(DESTDIR)$(GNUSTEP_BINDIR)
+-	install -m 0755 Mixer.app $(DESTDIR)$(GNUSTEP_BINDIR)/Mixer
+-
+-install-x11: all
+-	install -d  $(DESTDIR)$(X11_BINDIR)
+-	install -m 0755 Mixer.app $(DESTDIR)$(X11_BINDIR)/Mixer.app
++install: all
++	install -d  $(DESTDIR)$(BINDIR)
++	install -m 0755 Mixer.app $(DESTDIR)$(BINDIR)/Mixer.app
+ 
+ clean:
+ 	rm -f *~ *.o
diff --git a/x11-misc/mixer_app/mixer_app-1.8.0.ebuild b/x11-misc/mixer_app/mixer_app-1.8.0.ebuild
index 68782aac59c9..3ec1107bd9b9 100644
--- a/x11-misc/mixer_app/mixer_app-1.8.0.ebuild
+++ b/x11-misc/mixer_app/mixer_app-1.8.0.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/mixer_app/mixer_app-1.8.0.ebuild,v 1.12 2007/07/22 03:59:10 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/mixer_app/mixer_app-1.8.0.ebuild,v 1.13 2012/05/16 03:36:12 ssuominen Exp $
 
-#need to do some name mangling
-#so that ebuild name adheres to "standart"
-Name=Mixer.app
-S=${WORKDIR}/${Name}-${PV}
+EAPI=4
+inherit eutils toolchain-funcs
+
+MY_P=Mixer.app-${PV}
 
 DESCRIPTION="mixer utility that has three volume controllers that can be configured to handle any sound source"
-HOMEPAGE="http://www.fukt.bth.se/~per/mixer/"
-SRC_URI="http://www.fukt.bth.se/~per/mixer/${Name}-${PV}.tar.gz"
+HOMEPAGE="http://www.fukt.bsnet.se/~per/mixer/"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc sparc x86"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
@@ -22,12 +22,15 @@ RDEPEND="x11-libs/libX11
 DEPEND="${RDEPEND}
 	x11-proto/xextproto"
 
-src_compile() {
-	emake || die
+S=${WORKDIR}/${MY_P}
+
+DOCS="ChangeLog README"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build.patch
 }
 
-src_install() {
-	#make DESTDIR=${D} install || die
-	dobin Mixer.app
-	dodoc README ChangeLog
+src_compile() {
+	tc-export CXX
+	emake
 }