Version bump, drop old. Fixes bug 389733 by Simeon Maryasin

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

4 files changed, 33 insertions, 67 deletions

diff --git a/x11-misc/i3lock/ChangeLog b/x11-misc/i3lock/ChangeLog
index 4cc6cd71110d..93c99e601604 100644
--- a/x11-misc/i3lock/ChangeLog
+++ b/x11-misc/i3lock/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/i3lock
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/i3lock/ChangeLog,v 1.1 2011/07/22 09:41:18 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/i3lock/ChangeLog,v 1.2 2011/11/07 19:23:44 xarthisius Exp $
+
+*i3lock-2.2 (07 Nov 2011)
+
+  07 Nov 2011; Kacper Kowalik <xarthisius@gentoo.org> -i3lock-2.1.ebuild,
+  -files/i3lock-2.1-makefile.patch, +i3lock-2.2.ebuild:
+  Version bump, drop old. Fixes bug 389733 by Simeon Maryasin
 
 *i3lock-2.1 (22 Jul 2011)
 
diff --git a/x11-misc/i3lock/Manifest b/x11-misc/i3lock/Manifest
index 7ed34828264c..f804886addf7 100644
--- a/x11-misc/i3lock/Manifest
+++ b/x11-misc/i3lock/Manifest
@@ -1,17 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX i3lock-2.1-makefile.patch 1584 RMD160 fe0c54b141c6f9b14c2522628947bc43dc42c2dc SHA1 e3c5a30974d2646f349fe8955eaf35338e106b29 SHA256 dc618a9de7ee1e15ccd600c278f2308f148380cb4fbd6a133622d8644ccbee29
-DIST i3lock-2.1.tar.gz 26530 RMD160 5a4c4b080e665dc04350bea180339fea5ee58603 SHA1 e3dad64bc2d94057f2434bc95bb85907a946b6c4 SHA256 fbee053ad786a2d68e9aa6cabbc49f414d2f494939937c59be7030f408ae9731
-EBUILD i3lock-2.1.ebuild 780 RMD160 c65fc94b62b4c86563cb9ecb6d23ac42c352a8e2 SHA1 942fefd8bd46ae72ff1a2397295fd7a24c3019ba SHA256 3374d634cd386899be52601e3531e4498438bd80f5a5ac7477550e1c059db2bb
-MISC ChangeLog 399 RMD160 e152343f930e9f71fe590b52974a2a8500cd2f44 SHA1 675ccf26cbd89e69c62ca596d461f1e559db51c8 SHA256 edd18bbf59675b6b73f6795a6ed3b81d687028e2feae653bc3c2ee3232985092
+DIST i3lock-2.2.tar.bz2 24664 RMD160 5f96cc620f57746d714d4986eaff66d70644eeb1 SHA1 2fa327b19da58a943ffe3d8f2f348cb633c4bf55 SHA256 f870ae7e1fc0c9e09a944ea3641704ddf9fd2880dda14417a191aa619792ca89
+EBUILD i3lock-2.2.ebuild 797 RMD160 20ad0198190bdf8f129ffdc101a6f6acd0f18ecd SHA1 cff529a3206b21f33d378271f64d876c1e540fdb SHA256 47bac96d406f9a62c30fef0e1c8ee6baac19b68ac58d8a710b82ccdfc4120631
+MISC ChangeLog 619 RMD160 cbe64482a36ea01e76b2ac03cff622925ebd1773 SHA1 cbefbdc7b29e05bfd28d3fbab722d1e546d9a637 SHA256 c32fcce2cf11f1dd615f814243c2f025b974360d11833abfc57bbd72eed9cc3b
 MISC metadata.xml 264 RMD160 c148e577f07c64c6af50b8f0355923ae3e8b1d00 SHA1 b393cddf5b6235f10ad48ef49f402719f63ac7f8 SHA256 1800c92eae730be86a7957896944698a8e7f33004cf72cac17423708a4921d22
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQECAAYFAk4pRcoACgkQIiMqcbOVdxQItgP5Ae5+UTgStlOsNhIwJu71GXT6
-+1KjFK9ezy11+v0ItQbepLYiNnC6GBsNEfxmak1+CUZXAM1nmKH09QouomgDhqhs
-Cup2IildD6ZZcmuNXqf7IQRZx133BitY0R2yP0XdWMcuQYvT3lVvKkcH8LqDp/Rc
-FR2ZU17b6+IPTy9rF8A=
-=0tE6
+iQIcBAEBCAAGBQJOuDBKAAoJEF0huFKJUZL53aIP/j5hiBSWnsGtkYisqnl9Un6g
+63xI45yNfngCzmbEoImlkRQyFo71ytCThxCIqcyOl0GfIlhZedoEyWr9HXyouMmE
+GTtA6KOQtHvLUD14goN4CXxthonSdVkUQPc5L9u5kiNWQBbGi9XtVY/vZbaGou6Y
+gwCMrnDsTImVq6HhwMhHZi8vvNP+fZd9RI4e9BsMnctvUgKmbxbwi2NzuE72zC47
+oC/jW9MDBs6F9aUP5nkayUBGHtmZGi4kXlQi0aNkEFMLU5TE8IpCDcj58mvBQTbb
+eUXAmCsCkJqkn2FXK7ARD/9FwbzFdoJR60CEEUs8cWhE5H5Kw6pAWzrczzvxVr3I
+cq00oNbPtkCQD86fbFyV+yffHdY8AISx/0HMLgaf5T5WD6YGeGGZnu/SSEtRmofA
+5BhqutRK9rDc3Qavo5HGN7wL++2Bnebz4KcXBWwkjJd64V2UsmIG90d9PWeozlfz
+Qkg6/s6ruWbsB9vEAu+YBizpGY8n19IlonypWtHoVyzv4q1z38dPLL0QRWn/Nqsg
+F71gnYXbnAe8a8F+NN25LJLQH//sncT+yeaLUDHHo4/JNO1cXS9gaaYa3rvH+RbJ
+C6hDjzZn1RjzgT4EYL0+xk6uP2CijZq3OTBJPJ+pGVXw3XVIN10lEaRexEhmis+i
+vBZXC1IoLuZxLmoRcaB/
+=VRA1
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/i3lock/files/i3lock-2.1-makefile.patch b/x11-misc/i3lock/files/i3lock-2.1-makefile.patch
deleted file mode 100644
index a560c2d3d3fe..000000000000
--- a/x11-misc/i3lock/files/i3lock-2.1-makefile.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -10,30 +10,30 @@
- CFLAGS += -std=c99
- CFLAGS += -pipe
- CFLAGS += -Wall
--CFLAGS += -D_GNU_SOURCE
-+CPPFLAGS += -D_GNU_SOURCE
- ifndef NOLIBCAIRO
- CFLAGS += $(shell pkg-config --cflags cairo xcb-keysyms xcb-dpms)
--LDFLAGS += $(shell pkg-config --libs cairo xcb-keysyms xcb-dpms xcb-image)
-+LIBS += $(shell pkg-config --libs cairo xcb-keysyms xcb-dpms xcb-image)
- else
- CFLAGS += -DNOLIBCAIRO
- CFLAGS += $(shell pkg-config --cflags xcb-keysyms xcb-dpms)
--LDFLAGS += $(shell pkg-config --libs xcb-keysyms xcb-dpms xcb-image)
-+LIBS += $(shell pkg-config --libs xcb-keysyms xcb-dpms xcb-image)
- endif
--LDFLAGS += -lpam
-+LIBS += -lpam
- 
- FILES:=$(wildcard *.c)
- FILES:=$(FILES:.c=.o)
- 
- VERSION:=2.1
- GIT_VERSION:="2.1 (2011-03-13)"
--CFLAGS += -DVERSION=\"${GIT_VERSION}\"
-+CPPFLAGS += -DVERSION=\"${GIT_VERSION}\"
- 
- .PHONY: install clean uninstall
- 
- all: i3lock
- 
- i3lock: ${FILES}
--	$(CC) -o $@ $^ $(LDFLAGS)
-+	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
- 
- clean:
- 	rm -f i3lock ${FILES} i3lock-${VERSION}.tar.gz
-@@ -41,8 +41,12 @@
- install: all
- 	$(INSTALL) -d $(DESTDIR)$(PREFIX)/bin
- 	$(INSTALL) -d $(DESTDIR)$(SYSCONFDIR)/pam.d
-+	$(INSTALL) -d $(DESTDIR)$(PREFIX)/share/man/man1
-+	$(INSTALL) -d $(DESTDIR)$(PREFIX)/share/doc/i3lock-${VERSION}
- 	$(INSTALL) -m 755 i3lock $(DESTDIR)$(PREFIX)/bin/i3lock
- 	$(INSTALL) -m 644 i3lock.pam $(DESTDIR)$(SYSCONFDIR)/pam.d/i3lock
-+	$(INSTALL) -m 644 i3lock.1 $(DESTDIR)$(PREFIX)/share/man/man1
-+	$(INSTALL) -m 644 README $(DESTDIR)$(PREFIX)/share/doc/i3lock-${VERSION}
- 
- uninstall:
- 	rm -f $(DESTDIR)$(PREFIX)/bin/i3lock
diff --git a/x11-misc/i3lock/i3lock-2.1.ebuild b/x11-misc/i3lock/i3lock-2.2.ebuild
index 326f12068be8..fd252c257d27 100644
--- a/x11-misc/i3lock/i3lock-2.1.ebuild
+++ b/x11-misc/i3lock/i3lock-2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/i3lock/i3lock-2.1.ebuild,v 1.1 2011/07/22 09:41:18 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/i3lock/i3lock-2.2.ebuild,v 1.1 2011/11/07 19:23:44 xarthisius Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ inherit eutils toolchain-funcs
 
 DESCRIPTION="Simple screen locker"
 HOMEPAGE="http://i3wm.org/i3lock/"
-SRC_URI="http://i3wm.org/${PN}/${P}.tar.gz"
+SRC_URI="http://i3wm.org/${PN}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
@@ -21,16 +21,21 @@ RDEPEND="virtual/pam
 	cairo? ( x11-libs/cairo[xcb] )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
+DOC=( README )
 
 pkg_setup() {
 	tc-export CC
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
 	sed -i -e 's:login:system-auth:' ${PN}.pam || die
 }
 
 src_configure() {
 	use cairo || export NOLIBCAIRO=1
 }
+
+src_install() {
+	default
+	doman ${PN}.1
+}