summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2012-02-20 16:12:13 +0000
committerJeroen Roovers <jer@gentoo.org>2012-02-20 16:12:13 +0000
commit01a9b2cf0000db96a7849cdb99c493878adefa2a (patch)
tree978b8975ae4c9fb844a954676cb2c5439d725bce /x11-misc/slock
parentRespect the system set MAKEOPTS too, as per ssumien's sugesstion. (diff)
downloadhistorical-01a9b2cf0000db96a7849cdb99c493878adefa2a.tar.gz
historical-01a9b2cf0000db96a7849cdb99c493878adefa2a.tar.bz2
historical-01a9b2cf0000db96a7849cdb99c493878adefa2a.zip
Old.
Package-Manager: portage-2.2.0_alpha87/cvs/Linux x86_64
Diffstat (limited to 'x11-misc/slock')
-rw-r--r--x11-misc/slock/ChangeLog6
-rw-r--r--x11-misc/slock/Manifest17
-rw-r--r--x11-misc/slock/slock-0.9-r1.ebuild32
-rw-r--r--x11-misc/slock/slock-0.9.ebuild38
4 files changed, 10 insertions, 83 deletions
diff --git a/x11-misc/slock/ChangeLog b/x11-misc/slock/ChangeLog
index 482e439a8e4b..3920c2485f4c 100644
--- a/x11-misc/slock/ChangeLog
+++ b/x11-misc/slock/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-misc/slock
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slock/ChangeLog,v 1.34 2012/02/20 09:13:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slock/ChangeLog,v 1.35 2012/02/20 16:12:13 jer Exp $
+
+ 20 Feb 2012; Jeroen Roovers <jer@gentoo.org> -slock-0.9.ebuild,
+ -slock-0.9-r1.ebuild:
+ Old.
20 Feb 2012; Agostino Sarubbo <ago@gentoo.org> slock-1.0.ebuild:
Stable for AMD64, wrt security bug #401645
diff --git a/x11-misc/slock/Manifest b/x11-misc/slock/Manifest
index 4ed1ee8c7ddc..76ec85aa380a 100644
--- a/x11-misc/slock/Manifest
+++ b/x11-misc/slock/Manifest
@@ -1,21 +1,14 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
-DIST slock-0.9.tar.gz 3772 RMD160 cab7d0e1f59d05f96c1a74511ec18503726eb0bd SHA1 939ceb9f4ec274668ec37a38cfa3d8152df68f8c SHA256 89ddb73cbb79010c1979c72722344e5208f2d2fe98159739fa7e98285814d7bd
DIST slock-1.0.tar.gz 4313 RMD160 3fc1aa6c6aae9bfba59049a44f0330bef702f2df SHA1 38cef8503d512252e8f3f8275200e802990892c5 SHA256 b4e44ff1660f6f7eb270a0575d6ae1e0fbffcf0cdd96860a1695d57e89ae2df9
-EBUILD slock-0.9-r1.ebuild 712 RMD160 a1fa631e4873021791a391148489d202286ae53f SHA1 4038adcd6922b8e9adb6e7e703d8f4220f3c62e0 SHA256 81b038e16ab670596fe7f6069e558fa0c13a8022900d7206da6ef72ed7cefdf9
-EBUILD slock-0.9.ebuild 899 RMD160 192492fbab0ec0315a5651bd2f08692a2cb2d638 SHA1 6254c22bce61def3cf0dab6cbeb72337b2b7eec9 SHA256 00833e2db8714ff41a516d3d41ba9f2ee3de1d66c7ac888e45f65d919a35842b
EBUILD slock-1.0.ebuild 739 RMD160 8404013137bd1300d9f3647b924b0c1124d9b351 SHA1 74230a0abe0cdff39e0549738ff3d03f42b64aaa SHA256 1abb61351ea11f898ae91b9a6f38d42fa47542d0675834955efebaeb35d53c6e
-MISC ChangeLog 3766 RMD160 5ea26f7b5b370507502ed1bd63a65d85865de6d3 SHA1 32aefe13dcbdd024fcd0f4b2c05bf8dbe3dd3f93 SHA256 c4afc2be1e695c09bb3e87e7688c482421c7c0e08bc6245e0308728435c2ebe9
+MISC ChangeLog 3864 RMD160 2427656f6c110c98871f144e8a8d867a0cbf950f SHA1 e30a36e038bcdee8ff531e3f95d6db68ed2d5e13 SHA256 2a9c5ed640d9d81fa2dd70b0c3d29db992ad584b8cb810550029e9560c53f8ce
MISC metadata.xml 283 RMD160 0ba84d0240e0b9e5fc6aa1078e4e7c7c5c2b4baf SHA1 7688adc1f00ff3427b5eb4b3a04da41990cb8ffb SHA256 7e2a4a64ba3f17f2cab79ea96e0db5e0bbad412ef203caa0b4677e2bc1e07ce1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQEcBAEBCgAGBQJPQg6rAAoJEOTDgjZ80txdilsIAIn2v4gwf8dQWz5a+krvjOpA
-cw/URVfK8icmI3ZriZar0rhdZvk0VsBtBnj2nUamQ5I1F1bQk70UQmQi0VMo+LDV
-JuxuLqDUZflzcnTedo1qOUjtdmY/1sXPxQikHBiD+fDkfY2vfLUDM2JJfXhm1G89
-9gE3VPmt9ojKgP8XOtpU35m74IUVZkiLCBdSnjzkBOjjYH1VANWiG3h3DJiuE90d
-zZESONXjJELL9a/ENV/6tFgBJMQNyjSiMgim+X7D7bROTwX5LNCcaLh4ofpOq8tf
-D+uHLVgxz+at3ZobDMyHQX8DTaYBltbMiOfs77XgoRJq4rKjklgh4FdTeJj0uys=
-=pORq
+iEYEARECAAYFAk9CcOMACgkQVWmRsqeSphPkEACfXBrXGHiEotrUjRQOCQ38cREq
+JtcAnjF1iROUvseRzJVT7nqy5FDA6lZD
+=YYr2
-----END PGP SIGNATURE-----
diff --git a/x11-misc/slock/slock-0.9-r1.ebuild b/x11-misc/slock/slock-0.9-r1.ebuild
deleted file mode 100644
index edbee00a5229..000000000000
--- a/x11-misc/slock/slock-0.9-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slock/slock-0.9-r1.ebuild,v 1.3 2012/02/02 17:04:18 jer Exp $
-
-EAPI=4
-
-inherit toolchain-funcs
-
-DESCRIPTION="simple X screen locker"
-HOMEPAGE="http://tools.suckless.org/slock"
-SRC_URI="http://code.suckless.org/dl/tools/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE=""
-
-DEPEND="x11-libs/libX11"
-RDEPEND=${DEPEND}
-
-src_prepare() {
- sed -i config.mk \
- -e '/^CFLAGS/{s: -Os::g; s:= :+= :g}' \
- -e '/^CC/d' \
- -e '/^LDFLAGS/{s:-s::g; s:= :+= :g}' \
- || die
- tc-export CC
-}
-
-src_install() {
- emake DESTDIR="${D}" PREFIX="/usr" install
-}
diff --git a/x11-misc/slock/slock-0.9.ebuild b/x11-misc/slock/slock-0.9.ebuild
deleted file mode 100644
index 2a8692013e96..000000000000
--- a/x11-misc/slock/slock-0.9.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slock/slock-0.9.ebuild,v 1.5 2012/02/02 17:04:17 jer Exp $
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="simple X screen locker"
-HOMEPAGE="http://tools.suckless.org/slock"
-SRC_URI="http://code.suckless.org/dl/tools/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 hppa x86"
-IUSE=""
-
-DEPEND="x11-libs/libX11"
-RDEPEND=${DEPEND}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- sed -i \
- -e "s/CFLAGS = -std=c99 -pedantic -Wall -Os/CFLAGS += -std=c99 -pedantic -Wall -g/" \
- -e "s/LDFLAGS = -s/LDFLAGS += -g/" \
- config.mk || die "sed failed"
-}
-
-src_compile() {
- append-ldflags "-Wl,-z,now"
- emake CC=$(tc-getCC) || die "emake failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" PREFIX="/usr" install || die "emake install failed"
-
- dodoc README
-}