Version bump, ebuild cleanup

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

4 files changed, 99 insertions, 8 deletions

diff --git a/x11-plugins/wmmixer/ChangeLog b/x11-plugins/wmmixer/ChangeLog
index 566b434d63f3..938703c5ee9f 100644
--- a/x11-plugins/wmmixer/ChangeLog
+++ b/x11-plugins/wmmixer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-plugins/wmmixer
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmixer/ChangeLog,v 1.14 2008/12/22 22:51:03 ssuominen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmixer/ChangeLog,v 1.15 2012/08/21 09:08:25 voyageur Exp $
+
+*wmmixer-1.7 (21 Aug 2012)
+
+  21 Aug 2012; Bernard Cafarelli <voyageur@gentoo.org> +wmmixer-1.7.ebuild,
+  +files/wmmixer-1.7-respect_flags.patch:
+  Version bump, ebuild cleanup
 
 *wmmixer-1.5 (22 Dec 2008)
 
diff --git a/x11-plugins/wmmixer/Manifest b/x11-plugins/wmmixer/Manifest
index d20abc7926e3..9104173528e5 100644
--- a/x11-plugins/wmmixer/Manifest
+++ b/x11-plugins/wmmixer/Manifest
@@ -1,6 +1,19 @@
-AUX wmmixer-1.5-respect_flags.patch 935 RMD160 1b7ac764fd75e80a8cc4dee5e80f637f48564aed SHA1 9f4c35c6718f5082db22c88122e517bbf3a42e13 SHA256 b0d17470e0c781a3acf3634220c033d945d808da6ed77f08f15cf2d94b97cdb1
-AUX wmmixer-1.5-restore_pristine_code.patch 2719 RMD160 8af319abb677ab4c3b6a213e5f03f45da6ca707a SHA1 01edd267e54de7b4ca4953064d15375a32db3e07 SHA256 f89048d7184ca35cc30a2f6dcc1bd3f8dd5f86adf70f4551a9db697d23194882
-DIST wmmixer_1.5.orig.tar.gz 27483 RMD160 f310c009f81d90c9d9ef4756f0815129f520bb81 SHA1 6477d3370173630e1c7f498872f93bc66337a6ee SHA256 cf9862468670142ec68985511fbb0ec14df6245609dbee47a411af08f30874f3
-EBUILD wmmixer-1.5.ebuild 930 RMD160 7171fac4a2eabed1fa83d315d8875dad743d4c83 SHA1 89c0ca37e01614285aca89df488e1a6012c81e1e SHA256 bcc71fc3ecd56bab5ccf892248471204863a9362fdfe235c1103d4c1fbaa4cfa
-MISC ChangeLog 2021 RMD160 e9962dc3251315a8174c303bc5327e4b93332097 SHA1 6a486c3c186d6206c12663d0796d00d7de48bc87 SHA256 e796e5f1bc453a561f77562a49e083281a8e934b107fba395badb1510b32ceb0
-MISC metadata.xml 166 RMD160 329a26a7a3c988ec21889890b9cc64d0e23ce80b SHA1 92f1b1e68efc3b934ff7bcbeca7593b0f89c6a6a SHA256 5dba9ba575613d6cd1d28f1c9819cee44869bebba3cb8a91294bcca1402f5941
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX wmmixer-1.5-respect_flags.patch 935 SHA256 b0d17470e0c781a3acf3634220c033d945d808da6ed77f08f15cf2d94b97cdb1 SHA512 36a7c15fb81700efa10c2d8666f3cf32ec9db9e77975ac6726cc4f8fae1879c2099fcb064a14e717096c3550e881ba0fa18774bd91fe38faf3a7d9710f57bc47 WHIRLPOOL 5ad2981cbae662693d1152ab6e8a966dcbcb75b4698cc9a62ed1c5244a11a2b7dc31e08aa590991e0d8c41868bf1912326504e0116e898bcfb39b921651bd572
+AUX wmmixer-1.5-restore_pristine_code.patch 2719 SHA256 f89048d7184ca35cc30a2f6dcc1bd3f8dd5f86adf70f4551a9db697d23194882 SHA512 20bc69752065c1801b2fbd79572f35857e1857e777c1afdbc5fc198359a3465391f64dfb7710009949c820ec42e1c8ff7e201169c92ae0ed9f81949a02de3796 WHIRLPOOL c1707fe72cb65c04efafd20c67ceed6340220cd4f6485bbaf25e82fda53f004e5d14194f9e96c152731b28351c56a373a0c629ada8adf9870d753c8c8fa7985c
+AUX wmmixer-1.7-respect_flags.patch 857 SHA256 96c37f05488af298061be16ab8e3d632306364a63307ee2a689d84ab036730d8 SHA512 1e86f1b2433ca96e16412bf4056265877c19188acef1bf1592b501e947850c7ba45c5b251a584bfa9ba8a834273e88e75a543af04eaf3d65ca9bf57e7796658a WHIRLPOOL 197f5e19aabbc7f24f664b2c39aa935b7740aef270c229c63a13d219d57b9e804a94ffba4675f8f9f38bcc8ca700afde4123e2c49425a7032f8ee47c46424a81
+DIST wmmixer_1.5.orig.tar.gz 27483 SHA256 cf9862468670142ec68985511fbb0ec14df6245609dbee47a411af08f30874f3
+DIST wmmixer_1.7.orig.tar.gz 24916 SHA256 ee4ae77130dddeb8eb26d00fbbe879f09e1542d3cf8a3e713d8f8f8a91f4aecd SHA512 81e32a821df423aff4ee0eef8c1dbd7a8302f0f43f3a6cfec3fd71b26dfca536ae2f8e0313404976eb21c217724e074eed9bf40c67360f28e901d4265580a1e4 WHIRLPOOL 9baa5ae9c4b9b23836346539ef9fd70a494d45c0a583986b6572efe98e0ff036b67681da39f95fa344f7c3ab32dc8e1c24a6cdcf2f56c33157c828e367834b97
+EBUILD wmmixer-1.5.ebuild 930 SHA256 bcc71fc3ecd56bab5ccf892248471204863a9362fdfe235c1103d4c1fbaa4cfa SHA512 e9be26cdd19bdfcc379a8fa75e9b33116ceaad608876c166d5bd98ded8268f8849a1a3bc0f8cfa7dbfcc367e3aacc6e9e5c302c79e95ee60e817944b491aca24 WHIRLPOOL 9030387c771ba47513210aca57ac0b960c08de0554fdfd0e61085ba2f144719d80022328c42d54bf51025d862cbbc581c1557c5cd1f1b99e0e3195efb12495a2
+EBUILD wmmixer-1.7.ebuild 831 SHA256 b7351014c47778db9befa1d830e3468db3709d695f3e8ba4379ef0c6d64690f3 SHA512 9172cfdd4eda550e4aa7a41dbe866f8060371215dfc21914ec37e2ade1473a21d1d3f532afef37462aebd5e09d7d7831de615bb6d6c9fb5eb2fbd9bed6aa530b WHIRLPOOL d98fa23cdefbf14395beec8f449e74a9613a9ef6f95112874782f2dfe2f3fe265827233b34aae24f68c7b761dc72e12f489e4f36785e7d46b28e9740e9e5a9b9
+MISC ChangeLog 2198 SHA256 1421f78b1466c5a41524f5b5be39938232fe90aaecda2944288db772a8e6977d SHA512 91897dee88fc478b215f9afe0028662c374ffd1ab0a06f1dcbc3d5163c561526f5ed6550169bebe539f166eb4efba21671c75af5f2580f06b2d01ea1f13bbb6e WHIRLPOOL 3e3c8fe606c57d470cab9acc6c4e48f087e5c9d46e329d6aac19ac93454ef5f245e36e431c55312317f5345d90c78ee81fb7622bba11bbdd9fc59aec23813937
+MISC metadata.xml 166 SHA256 5dba9ba575613d6cd1d28f1c9819cee44869bebba3cb8a91294bcca1402f5941 SHA512 85f57124de5c89f57dfd2f9c969701908554ebd07f50a084835ae35d91395fe79c6fa002c040546854009e700e7c65e9345fdb3a616978fab14c08939721f616 WHIRLPOOL 203631ae3c7368dbd852a4ae2d6826d6bbc02a3417f816c84c8b16220aafff00a62e5b3bb46d231e4702fbce62b4a172c8db1aac275b6c8975dc669dfc9bd7a9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlAzUBQACgkQFYEBGcdFJfIPCwD9E3j8421phtDUGdJPR+Z/reDJ
+KJGfC10PXeOEsuwRcfoBAJkynoj5M/mq8MG4HnO4NDVsZJFoZH8aafcIyMPT5iRO
+=xBFB
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/wmmixer/files/wmmixer-1.7-respect_flags.patch b/x11-plugins/wmmixer/files/wmmixer-1.7-respect_flags.patch
new file mode 100644
index 000000000000..ba55e6d9fb70
--- /dev/null
+++ b/x11-plugins/wmmixer/files/wmmixer-1.7-respect_flags.patch
@@ -0,0 +1,34 @@
+--- Makefile.orig	2012-08-21 11:03:31.028266807 +0200
++++ Makefile	2012-08-21 11:05:06.808876995 +0200
+@@ -1,19 +1,12 @@
+ # $Id: wmmixer-1.7-respect_flags.patch,v 1.1 2012/08/21 09:08:25 voyageur Exp $
+ 
+-prefix      = /usr/local
++prefix      = /usr
+ exec_prefix = ${prefix}
+ bindir      = ${exec_prefix}/bin
+ mandir      = ${prefix}/share/man
+ 
+-DESTDIR     =
+-
+-CXX	    = g++
+-CXXFLAGS    = -O -Wall
+-EXTRA_LIBS  = -L/usr/X11R6/lib -lX11 -lXpm -lXext
+-
+-
+-LD 	    = g++
+-LDFLAGS     = -o $(EXECUTABLE) $(CXXFLAGS)
++CXX	    ?= g++
++LIBS        = -lX11 -lXpm -lXext
+ 
+ EXECUTABLE  = wmmixer
+ OBJS	    = xhandler.o mixctl.o wmmixer.o exception.o
+@@ -26,7 +19,7 @@
+ 	$(CXX) $(CXXFLAGS) -c -o $@ $<
+ 
+ $(EXECUTABLE): $(OBJS)
+-	$(LD) $(LDFLAGS) $(OBJS) $(EXTRA_LIBDIRS) $(EXTRA_LIBS)
++	$(CXX) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXECUTABLE)
+ 
+ all: $(EXECUTABLE)
+ 
diff --git a/x11-plugins/wmmixer/wmmixer-1.7.ebuild b/x11-plugins/wmmixer/wmmixer-1.7.ebuild
new file mode 100644
index 000000000000..f5f78d9bbbc5
--- /dev/null
+++ b/x11-plugins/wmmixer/wmmixer-1.7.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmixer/wmmixer-1.7.ebuild,v 1.1 2012/08/21 09:08:25 voyageur Exp $
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A mixer designed for WindowMaker"
+HOMEPAGE="http://packages.qa.debian.org/w/wmmixer.html"
+SRC_URI="mirror://debian/pool/main/w/${PN}/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~mips ~sparc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	x11-proto/xextproto"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-respect_flags.patch
+}
+
+src_compile() {
+	emake CXX=$(tc-getCXX)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc CHANGES home.wmmixer README
+}