[gentoo-commits] dev/xmw:master commit in: app-misc/gtimeutils/files/, app-misc/gtimeutils/

[Michael Weber]

commit:     8b13ad433a8816d5af686c199caf6ce4e0afee4e
Author:     Michael Weber <michael <AT> xmw <DOT> de>
AuthorDate: Wed May 29 10:15:32 2013 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Wed May 29 10:15:32 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/xmw.git;a=commit;h=8b13ad43

Add snapshot, fill deps.

Package-Manager: portage-2.2.0_alpha177
Manifest-Sign-Key: 62EEF090

---
 app-misc/gtimeutils/ChangeLog                      |  7 +++++
 app-misc/gtimeutils/Manifest                       | 11 ++++++++
 .../files/gtimeutils-0_p20130520-Makefile.patch    | 33 ++++++++++++++++++++++
 .../files/gtimeutils-9999-Makefile.patch           | 32 ---------------------
 ...s-9999.ebuild => gtimeutils-0_p20130520.ebuild} | 14 +++++----
 app-misc/gtimeutils/gtimeutils-9999.ebuild         | 10 ++++---
 6 files changed, 65 insertions(+), 42 deletions(-)

diff --git a/app-misc/gtimeutils/ChangeLog b/app-misc/gtimeutils/ChangeLog
index fc938be..9de4203 100644
--- a/app-misc/gtimeutils/ChangeLog
+++ b/app-misc/gtimeutils/ChangeLog
@@ -1,3 +1,10 @@
+*gtimeutils-0_p20130520 (29 May 2013)
+
+  29 May 2013; Michael Weber <xmw@g.o>
+  +files/gtimeutils-0_p20130520-Makefile.patch, +gtimeutils-0_p20130520.ebuild,
+  -files/gtimeutils-9999-Makefile.patch, gtimeutils-9999.ebuild:
+  Add snapshot, fill deps.
+
   24 May 2013; Michael Weber <xmw@g.o> gtimeutils-9999.ebuild:
   drop keywords from live version
 

diff --git a/app-misc/gtimeutils/Manifest b/app-misc/gtimeutils/Manifest
new file mode 100644
index 0000000..532fe5f
--- /dev/null
+++ b/app-misc/gtimeutils/Manifest
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST gtimeutils-0_p20130520.tar.gz 5856 SHA256 618d4e2a28b1def8525e160d457e8e199cc1b4936536619a5939ad1415778860 SHA512 f648ca428898a5c2980c8e9dc2e7abb74f95c669807cac209219cf356bcc92d684ad558ad45f3e20c44801c0dcdfb8b937be7950d755f49dcb5066db519eeab3 WHIRLPOOL 6c2b44fc363a633ad46650654b07fdfd2c1ad9f5e4f5febff33caf3c63501aa2cef35dbaf8d4f12a6690cca3dd061b172e69d46c64c5064a1109f85046cd80bf
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iF4EAREIAAYFAlGl1UQACgkQknrdDGLu8JCsJgD/U4afc0IftApO3GvdHSKEhuDb
+hVSeiXJXZoTk2kp1C1wBAIwCl+su0aR728kNXQD0K6vO2Kfl2DgDQ8YCEQOyn+0F
+=GBJ6
+-----END PGP SIGNATURE-----

diff --git a/app-misc/gtimeutils/files/gtimeutils-0_p20130520-Makefile.patch b/app-misc/gtimeutils/files/gtimeutils-0_p20130520-Makefile.patch
new file mode 100644
index 0000000..df4c002
--- /dev/null
+++ b/app-misc/gtimeutils/files/gtimeutils-0_p20130520-Makefile.patch
@@ -0,0 +1,33 @@
+--- gtimeutils-9999/Makefile
++++ gtimeutils-9999/Makefile
+@@ -1,6 +1,6 @@
+-CC       = gcc
++CC       ?= gcc
+ GTK     ?= 3
+-CFLAGS   = -std=c99 -Wall -Wextra -DGTK${GTK}
++CFLAGS   += -std=c99 -Wall -Wextra -DGTK${GTK}
+ 
+ LIBS_TIMER = $(shell pkg-config --cflags --libs gtk+-${GTK}.0 libnotify libcanberra)
+ LIBS_STOPW = $(shell pkg-config --cflags --libs gtk+-${GTK}.0 libnotify libcanberra)
+@@ -8,17 +8,17 @@
+ PREFIX   ?= /usr/local
+ BINPREFIX = $(PREFIX)/bin
+ 
+-all: CFLAGS += -Os
++all: CFLAGS +=
+ all: gstopwatch gtimer
+ 
+-debug: CFLAGS += -O0 -g -pedantic -DDEBUG
++debug: CFLAGS += -g -pedantic -DDEBUG
+ debug: all
+ 
+ gstopwatch: gstopwatch.c
+-	$(CC) gstopwatch.c -o gstopwatch $(CFLAGS) $(LIBS_STOPW)
++	$(CC) gstopwatch.c -o gstopwatch $(CFLAGS) $(LIBS_STOPW) $(LDFLAGS)
+ 
+ gtimer: gtimer.c
+-	$(CC) gtimer.c -o gtimer $(CFLAGS) $(LIBS_TIMER)
++	$(CC) gtimer.c -o gtimer $(CFLAGS) $(LIBS_TIMER) $(LDFLAGS)
+ 
+ install:
+ 	mkdir -p $(DESTDIR)/$(BINPREFIX)

diff --git a/app-misc/gtimeutils/files/gtimeutils-9999-Makefile.patch b/app-misc/gtimeutils/files/gtimeutils-9999-Makefile.patch
deleted file mode 100644
index 1a9ec17..0000000
--- a/app-misc/gtimeutils/files/gtimeutils-9999-Makefile.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- gtimeutils-9999/Makefile
-+++ gtimeutils-9999/Makefile
-@@ -1,22 +1,21 @@
--jCC      = gcc
--CFLAGS   = -std=c99 -Wall -Wextra
--LIBS_TIMER = `pkg-config --cflags --libs gtk+-3.0 libnotify libcanberra`
--LIBS_STOPW = `pkg-config --cflags --libs gtk+-3.0`
-+CC      ?= gcc
-+CFLAGS  += -std=c99 -Wall -Wextra
-+LIBS_TIMER = $(shell pkg-config --cflags --libs gtk+-3.0 libnotify libcanberra)
-+LIBS_STOPW = $(shell pkg-config --cflags --libs gtk+-3.0)
-  
- PREFIX   ?= /usr/local
- BINPREFIX = $(PREFIX)/bin
- 
--all: CFLAGS += -Os
- all: gstopwatch gtimer
- 
--debug: CFLAGS += -O0 -g -pedantic -DDEBUG
-+debug: CFLAGS += -pedantic -DDEBUG
- debug: all
- 
- gstopwatch: gstopwatch.c
--	$(CC) gstopwatch.c -o gstopwatch $(CFLAGS) $(LIBS_STOPW)
-+	$(CC) gstopwatch.c -o gstopwatch $(CFLAGS) $(LIBS_STOPW) ${LDFLAGS}
- 
- gtimer: gtimer.c
--	$(CC) gtimer.c -o gtimer $(CFLAGS) $(LIBS_TIMER)
-+	$(CC) gtimer.c -o gtimer $(CFLAGS) $(LIBS_TIMER) ${LDFLAGS}
- 
- install:
- 	mkdir -p $(DESTDIR)/$(BINPREFIX)

diff --git a/app-misc/gtimeutils/gtimeutils-9999.ebuild b/app-misc/gtimeutils/gtimeutils-0_p20130520.ebuild
similarity index 57%
copy from app-misc/gtimeutils/gtimeutils-9999.ebuild
copy to app-misc/gtimeutils/gtimeutils-0_p20130520.ebuild
index 35b289b..db1c2dc 100644
--- a/app-misc/gtimeutils/gtimeutils-9999.ebuild
+++ b/app-misc/gtimeutils/gtimeutils-0_p20130520.ebuild
@@ -4,19 +4,21 @@
 
 EAPI=5
 
-inherit eutils git-2 toolchain-funcs
+inherit eutils toolchain-funcs vcs-snapshot
 
 DESCRIPTION="simple stopwatch and timer, written in GTK3"
 HOMEPAGE="https://github.com/Unia/gtimeutils"
-EGIT_REPO_URI="git://github.com/Unia/${PN}.git"
+SRC_URI="https://github.com/Unia/${PN}/tarball/da49c34 -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=""
-RDEPEND="${DEPEND}"
+RDEPEND="media-libs/libcanberra
+	x11-libs/gtk+:3
+	x11-libs/libnotify"
+DEPEND="${RDEPEND}"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-Makefile.patch
@@ -24,5 +26,5 @@ src_prepare() {
 }
 
 src_install() {
-	emake PREFIX=/usr DESTDIR="${D}" install
+	emake DESTDIR="${D}" PREFIX=/usr install
 }

diff --git a/app-misc/gtimeutils/gtimeutils-9999.ebuild b/app-misc/gtimeutils/gtimeutils-9999.ebuild
index 35b289b..645a5a9 100644
--- a/app-misc/gtimeutils/gtimeutils-9999.ebuild
+++ b/app-misc/gtimeutils/gtimeutils-9999.ebuild
@@ -15,14 +15,16 @@ SLOT="0"
 KEYWORDS=""
 IUSE=""
 
-DEPEND=""
-RDEPEND="${DEPEND}"
+RDEPEND="media-libs/libcanberra
+	x11-libs/gtk+:3
+	x11-libs/libnotify"
+DEPEND="${RDEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-Makefile.patch
+	epatch "${FILESDIR}"/${PN}-0_p20130520-Makefile.patch
 	tc-export CC
 }
 
 src_install() {
-	emake PREFIX=/usr DESTDIR="${D}" install
+	emake DESTDIR="${D}" PREFIX=/usr install
 }