From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Qqwtz-0004je-En for garchives@archives.gentoo.org; Wed, 10 Aug 2011 00:44:07 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7EED521C05F; Wed, 10 Aug 2011 00:43:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 242BF21C05F for ; Wed, 10 Aug 2011 00:43:59 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 96DE61B404B for ; Wed, 10 Aug 2011 00:43:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id EB41680040 for ; Wed, 10 Aug 2011 00:43:57 +0000 (UTC) From: "Michael Weber" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Weber" Message-ID: <938e0b59f294757c07506f0afb04c90a30dd1c41.xmw@gentoo> Subject: [gentoo-commits] dev/xmw:master commit in: x11-misc/trayer-srg/files/, x11-misc/trayer-srg/ X-VCS-Repository: dev/xmw X-VCS-Files: x11-misc/trayer-srg/ChangeLog x11-misc/trayer-srg/Manifest x11-misc/trayer-srg/files/trayer-srg-1.1.2-as-needed.patch x11-misc/trayer-srg/files/trayer-srg-1.1.2-cflags.patch x11-misc/trayer-srg/files/trayer-srg-1.1.2-panel_height.patch x11-misc/trayer-srg/trayer-srg-1.1.2.ebuild x11-misc/trayer-srg/trayer-srg-1.1.3.ebuild x11-misc/trayer-srg/trayer-srg-9999.ebuild X-VCS-Directories: x11-misc/trayer-srg/files/ x11-misc/trayer-srg/ X-VCS-Committer: xmw X-VCS-Committer-Name: Michael Weber X-VCS-Revision: 938e0b59f294757c07506f0afb04c90a30dd1c41 Date: Wed, 10 Aug 2011 00:43:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 48fe400156300e7b85f36b05ba23a660 commit: 938e0b59f294757c07506f0afb04c90a30dd1c41 Author: Michael Weber gentoo org> AuthorDate: Wed Aug 10 00:39:08 2011 +0000 Commit: Michael Weber gentoo org> CommitDate: Wed Aug 10 00:39:08 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/xmw.git;a=3Dco= mmit;h=3D938e0b59 x11-misc/trayer-srg: Version bump, patches gone upstrea (Portage version: 2.1.10.3/git/Linux x86_64, signed Manifest commit with = key 62EEF090) --- x11-misc/trayer-srg/ChangeLog | 9 ++++++ x11-misc/trayer-srg/Manifest | 17 ++++------ .../files/trayer-srg-1.1.2-as-needed.patch | 13 -------- .../trayer-srg/files/trayer-srg-1.1.2-cflags.patch | 26 --------------= -- .../files/trayer-srg-1.1.2-panel_height.patch | 31 --------------= ------ ...er-srg-1.1.2.ebuild =3D> trayer-srg-1.1.3.ebuild} | 6 +--- x11-misc/trayer-srg/trayer-srg-9999.ebuild | 6 +--- 7 files changed, 18 insertions(+), 90 deletions(-) diff --git a/x11-misc/trayer-srg/ChangeLog b/x11-misc/trayer-srg/ChangeLo= g index 7a86d5c..a82d0a8 100644 --- a/x11-misc/trayer-srg/ChangeLog +++ b/x11-misc/trayer-srg/ChangeLog @@ -2,6 +2,15 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ =20 +*trayer-srg-1.1.3 (10 Aug 2011) + + 10 Aug 2011; Michael Weber -trayer-srg-1.1.2.ebuild, + -files/trayer-srg-1.1.2-as-needed.patch, + -files/trayer-srg-1.1.2-cflags.patch, + -files/trayer-srg-1.1.2-panel_height.patch, +trayer-srg-1.1.3.ebuild, + trayer-srg-9999.ebuild: + Version bump, patches gone upstream, thanks Daniel (sargon). + 09 Aug 2011; Michael Weber trayer-srg-1.1.2.ebuild, +files/trayer-srg-1.1.2-as-needed.patch, +files/trayer-srg-1.1.2-cflags.patch, diff --git a/x11-misc/trayer-srg/Manifest b/x11-misc/trayer-srg/Manifest index 6c5f54f..dc9df16 100644 --- a/x11-misc/trayer-srg/Manifest +++ b/x11-misc/trayer-srg/Manifest @@ -1,18 +1,15 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 =20 -AUX trayer-srg-1.1.2-as-needed.patch 280 RMD160 b9fc1b91c5b24f996ece1ab6= a50defc6b9e42518 SHA1 62ed7488c7b8bffca12ac13b015b6f917f133057 SHA256 92d= e65225a5b9112eca895ff96e5d9be6cd894140bfa26bed4f8c0c43c7efd3e -AUX trayer-srg-1.1.2-cflags.patch 771 RMD160 41438a786b6526f400c941e1819= 01038915d0338 SHA1 ae7f59789379395dad30df2a24cdcf162b1c2f61 SHA256 b6e753= a5800221d3957c8812b9b264b44123622017969e46174aa308eac23532 -AUX trayer-srg-1.1.2-panel_height.patch 911 RMD160 15c6fbfc0b294cced42d7= bebe9907fc907a1bddd SHA1 97e0776b23c47163fa378d950b696de113d7e121 SHA256 = fb8d0a14540b10aa67c12f120d8bd98ed41a2b5fd856c4f54c23e2b2d41fd538 -DIST trayer-srg-1.1.2.tar.gz 24640 RMD160 0e5204fb92cda2ad529062ac664c49= 8d13b570cf SHA1 33519e225115830322b03a97893a54ffacd9e465 SHA256 31ddc1cfc= d6b3f142ffa46e8fde369026d15556c5867884188f5cb1d2c917ad7 -EBUILD trayer-srg-1.1.2.ebuild 862 RMD160 936ddad5fbdb703cb73f83230c0132= 9f44174a0d SHA1 e303b3c7d78f67954422b339c8bbd75949f310a4 SHA256 421d831cb= c52f6266074b59bc0701fea0eeb88e7927d7f0792f5a12bf64f5625 -EBUILD trayer-srg-9999.ebuild 793 RMD160 3d99f964aeb61c6e7150c70bdae3bb8= 03ebf4f6b SHA1 643ac1e93bb549ffe7a271986d3b579c28a17fc8 SHA256 1723e53f57= 95d764385236b74512e49de426f5c6b98a150ac13560bab287be59 -MISC ChangeLog 562 RMD160 1d09c84aff5783a95c1231dfa7922e552b02b138 SHA1 = 51e3a7f60e0f22ffee1aef19c014a549a6fb8bbc SHA256 1e961829cfacdd4b48617aef9= a49230735ce019f437334a2d9ae1fea3cef8dd8 +DIST trayer-srg-1.1.3.tar.gz 24671 RMD160 d6883a4aee4d3d87e5ef62a3dc47d4= 2f64f38a26 SHA1 e4ee8578565dff6b30551b838daa3e9032de30ed SHA256 03be5ea47= 278ecdb6ffb1d3b5115a855a6eccd6aa6702b84e89ee047ddd76558 +EBUILD trayer-srg-1.1.3.ebuild 771 RMD160 aca7dba6eb595f8fc91e6c6e49c458= 1a0a8245a6 SHA1 7f4c4a109fb81cc37cf7a2e6059359a1a4d6ff4f SHA256 10a014315= cdee6dad4907bd773aa740e982a26aff7d4004199362416cf1d9d98 +EBUILD trayer-srg-9999.ebuild 697 RMD160 eeaec21878f142ad198854c4785ee86= 13204670b SHA1 7e0a76d82fd4d868b9b04d774b6cdd633625616a SHA256 b08178da2d= 3b232e6cc18fb020bc182861b24393a494223c893b946a8981144c +MISC ChangeLog 912 RMD160 297fcd6723f53bc37fe729e2de463447adfde13c SHA1 = ccbf16bf48c0edbe0df8a2ca1ba249b1a1949778 SHA256 32ac6df5a81389f5b321e8626= e60c4bd5bcc1ca47fa95d24f5485fbf805af891 MISC metadata.xml 245 RMD160 6b03982a4d5f32d9fa6b9259ae36f9fcb07c8404 SH= A1 fb16c7b4c5ab071dd979f761b8bb075f5396b737 SHA256 375a1da02cd2c393ce2378= a73c1ce08134bc030b3bb378c6a4d6ca9cd5be1f8d -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) =20 -iF4EAREIAAYFAk5AmdAACgkQknrdDGLu8JDaxwEAkIANdhZAlTdu0SZu+Zh7Med8 -ln/fwLNjWhuW16k29lsA/Al5cmUkqqFmq0nWBUCl2xf5AEYewu1T6okx7v3wvPe6 -=3DF0we +iF4EAREIAAYFAk5B0ysACgkQknrdDGLu8JBVHAD8Cagw2IYsblthJlIzk19VT3XK +C9Rv8oJkdLzqFiNM5G0BAIPDCSPgCU5A1wW7gDOVu4t4hrZ8L8jDWMS3K1frmW6y +=3Drq6d -----END PGP SIGNATURE----- diff --git a/x11-misc/trayer-srg/files/trayer-srg-1.1.2-as-needed.patch b= /x11-misc/trayer-srg/files/trayer-srg-1.1.2-as-needed.patch deleted file mode 100644 index 851b21f..0000000 --- a/x11-misc/trayer-srg/files/trayer-srg-1.1.2-as-needed.patch +++ /dev/null @@ -1,13 +0,0 @@ -https://github.com/sargon/trayer-srg/issues/4 - ---- trayer-srg-1.1.2/Makefile -+++ trayer-srg-1.1.2/Makefile -@@ -19,7 +19,7 @@ -=20 - TARGET =3D trayer - $(TARGET): $(OBJ)=20 -- $(CC) $(LDFLAGS) $(LIBS) $(OBJ) -o $@ -+ $(CC) $(LDFLAGS) $(OBJ) -o $@ $(LIBS) - ifeq (,$(DEVEL)) - strip $@ - endif diff --git a/x11-misc/trayer-srg/files/trayer-srg-1.1.2-cflags.patch b/x1= 1-misc/trayer-srg/files/trayer-srg-1.1.2-cflags.patch deleted file mode 100644 index d9d56de..0000000 --- a/x11-misc/trayer-srg/files/trayer-srg-1.1.2-cflags.patch +++ /dev/null @@ -1,26 +0,0 @@ -https://github.com/sargon/trayer-srg/issues/3 - ---- trayer-srg-1.1.2/Makefile.common -+++ trayer-srg-1.1.2/Makefile.common -@@ -15,17 +15,16 @@ - endif - endif -=20 --CC =3D gcc -+CC ?=3D gcc - LIBS =3D $(shell pkg-config --libs gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-x= lib-2.0) -lX11 -L/usr/X11R6/lib -lXmu - INCS =3D $(shell pkg-config --cflags gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf= -xlib-2.0) --CFLAGS =3D -O2 # overwriten by command line or env. variable --CFLAGS +=3D -Wall # always nice to have=20 -+CFLAGS ?=3D -O2 -Wall - ifneq (,$(DEVEL)) --CFLAGS :=3D -g -Wall=20 -+CFLAGS ?=3D -g -Wall=20 - endif -=20 - # -DGTK_DISABLE_DEPRECATED does not work yet --CFLAGS +=3D -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -+#CFLAGS +=3D -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -=20 - %.o: %.c - $(CC) $(CFLAGS) $(INCS) -c $< diff --git a/x11-misc/trayer-srg/files/trayer-srg-1.1.2-panel_height.patc= h b/x11-misc/trayer-srg/files/trayer-srg-1.1.2-panel_height.patch deleted file mode 100644 index a5d87cb..0000000 --- a/x11-misc/trayer-srg/files/trayer-srg-1.1.2-panel_height.patch +++ /dev/null @@ -1,31 +0,0 @@ -https://github.com/sargon/trayer-srg/issues/5 - ---- trayer-srg-1.1.2/panel.h -+++ trayer-srg-1.1.2/panel.h -@@ -18,7 +18,7 @@ -=20 - #define PANEL_HEIGHT_DEFAULT 26 - #define PANEL_HEIGHT_MAX 200 --#define PANEL_HEIGHT_MIN 16 -+#define PANEL_HEIGHT_MIN 2 -=20 -=20 - typedef struct { ---- trayer-srg-1.1.2/panel.c -+++ trayer-srg-1.1.2/panel.c -@@ -337,10 +337,13 @@ - p->width =3D 100; - p->heighttype =3D HEIGHT_PIXEL; - if (p->heighttype =3D=3D HEIGHT_PIXEL) { -- if (p->height < PANEL_HEIGHT_MIN) -+ if (p->height < PANEL_HEIGHT_MIN) { -+ ERR( "height is bound by %i pixels\n", PANEL_HEIGHT_MIN ); - p->height =3D PANEL_HEIGHT_MIN; -- else if (p->height > PANEL_HEIGHT_MAX) -+ } else if (p->height > PANEL_HEIGHT_MAX) { -+ ERR( "height is bound by %i pixels\n", PANEL_HEIGHT_MAX ); - p->height =3D PANEL_HEIGHT_MAX; -+ } - } - panel_start_gui(p); - RET(1); diff --git a/x11-misc/trayer-srg/trayer-srg-1.1.2.ebuild b/x11-misc/traye= r-srg/trayer-srg-1.1.3.ebuild similarity index 80% rename from x11-misc/trayer-srg/trayer-srg-1.1.2.ebuild rename to x11-misc/trayer-srg/trayer-srg-1.1.3.ebuild index f607282..dc8f5b8 100644 --- a/x11-misc/trayer-srg/trayer-srg-1.1.2.ebuild +++ b/x11-misc/trayer-srg/trayer-srg-1.1.3.ebuild @@ -8,7 +8,7 @@ inherit eutils toolchain-funcs =20 DESCRIPTION=3D"trayer fork with multi monitor support, cleaned up codeba= se and other fancy stuff" HOMEPAGE=3D"https://github.com/sargon/trayer-srg" -SRC_URI=3D"https://github.com/sargon/trayer-srg/tarball/trayer-1.1.2 -> = ${P}.tar.gz" +SRC_URI=3D"https://github.com/sargon/${PN}/tarball/${P/-srg/} -> ${P}.ta= r.gz" =20 LICENSE=3D"MIT" SLOT=3D"0" @@ -27,10 +27,6 @@ src_unpack() { mv *-${PN}-* ${P} || die } =20 -src_prepare() { - epatch "${FILESDIR}"/${P}-{as-needed,cflags,panel_height}.patch -} - src_compile() { emake DEVEL=3D1 TARGET=3D${PN} CC=3D"$(tc-getCC)" || die } diff --git a/x11-misc/trayer-srg/trayer-srg-9999.ebuild b/x11-misc/trayer= -srg/trayer-srg-9999.ebuild index 5a2bc86..7df1835 100644 --- a/x11-misc/trayer-srg/trayer-srg-9999.ebuild +++ b/x11-misc/trayer-srg/trayer-srg-9999.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D3 =20 -EGIT_REPO_URI=3D"https://github.com/sargon/trayer-srg.git" +EGIT_REPO_URI=3D"https://github.com/sargon/${PN}.git" =20 inherit eutils git-2 toolchain-funcs =20 @@ -24,10 +24,6 @@ RDEPEND=3D"x11-libs/gdk-pixbuf:2 DEPEND=3D"${RDEPEND} dev-util/pkgconfig" =20 -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.1.2-{as-needed,cflags,panel_height}.patch -} - src_compile() { emake DEVEL=3D1 TARGET=3D${PN} CC=3D"$(tc-getCC)" || die }