diff options
author | Julian Ospald <hasufell@gentoo.org> | 2012-12-10 21:03:47 +0000 |
---|---|---|
committer | Julian Ospald <hasufell@gentoo.org> | 2012-12-10 21:03:47 +0000 |
commit | 5d2d48c687f0ff0e8504fb960ceb5ceac71b620e (patch) | |
tree | b65bbd4bedb86527b19ee55fdaa2eff80a53e925 /x11-misc | |
parent | version bump (diff) | |
download | gentoo-2-5d2d48c687f0ff0e8504fb960ceb5ceac71b620e.tar.gz gentoo-2-5d2d48c687f0ff0e8504fb960ceb5ceac71b620e.tar.bz2 gentoo-2-5d2d48c687f0ff0e8504fb960ceb5ceac71b620e.zip |
fix license wrt #446778, remove old
(Portage version: 2.2.0_alpha145/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)
Diffstat (limited to 'x11-misc')
-rw-r--r-- | x11-misc/xsnap/ChangeLog | 6 | ||||
-rw-r--r-- | x11-misc/xsnap/files/xsnap-1.5.6-gentoo.patch | 29 | ||||
-rw-r--r-- | x11-misc/xsnap/xsnap-1.5.10.ebuild | 4 | ||||
-rw-r--r-- | x11-misc/xsnap/xsnap-1.5.6.ebuild | 49 | ||||
-rw-r--r-- | x11-misc/xsnap/xsnap-1.5.9.ebuild | 4 |
5 files changed, 9 insertions, 83 deletions
diff --git a/x11-misc/xsnap/ChangeLog b/x11-misc/xsnap/ChangeLog index 0ef350613416..cc403c0957ad 100644 --- a/x11-misc/xsnap/ChangeLog +++ b/x11-misc/xsnap/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-misc/xsnap # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xsnap/ChangeLog,v 1.46 2012/03/19 19:12:51 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xsnap/ChangeLog,v 1.47 2012/12/10 21:03:47 hasufell Exp $ + + 10 Dec 2012; Julian Ospald <hasufell@gentoo.org> -xsnap-1.5.6.ebuild, + -files/xsnap-1.5.6-gentoo.patch, xsnap-1.5.9.ebuild, xsnap-1.5.10.ebuild: + fix license wrt #446778, remove old 19 Mar 2012; Raúl Porcel <armin76@gentoo.org> xsnap-1.5.6.ebuild, xsnap-1.5.9.ebuild, xsnap-1.5.10.ebuild: diff --git a/x11-misc/xsnap/files/xsnap-1.5.6-gentoo.patch b/x11-misc/xsnap/files/xsnap-1.5.6-gentoo.patch deleted file mode 100644 index 6e80e332a026..000000000000 --- a/x11-misc/xsnap/files/xsnap-1.5.6-gentoo.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- xsnap-1.5.6/Imakefile.org 2009-09-23 08:51:44.000000000 +0200 -+++ xsnap-1.5.6/Imakefile 2010-02-08 12:50:20.000000000 +0100 -@@ -1,6 +1,6 @@ -- XPM_INCLUDES = -I/usr/X11R6/include/X11 -- XPMLIB = -L/usr/X11R6/lib -lXpm -- PNGLIB = -lpng -+ XPM_INCLUDES = -+ XPMLIB = $(shell pkg-config --libs xpm) -+ PNGLIB = $(shell pkg-config --libs libpng) - JPEGLIB = -ljpeg - /* - XPM_INCLUDES = -I/opt/xpm/include/X11 -@@ -25,13 +25,13 @@ - ComplexProgramTarget(xsnap) - - all:: -- cd po ; make -+ cd po ; $(MAKE) - - install:: - cp -f xsnap_ocr $(DESTDIR)/$(BINDIR) -- cd po ; make install -+ cd po ; $(MAKE) install - - clean:: -- cd po ; make clean -+ cd po ; $(MAKE) clean - rm -f *stamp - diff --git a/x11-misc/xsnap/xsnap-1.5.10.ebuild b/x11-misc/xsnap/xsnap-1.5.10.ebuild index 4d4b5fdf745d..5e0f2f0b4421 100644 --- a/x11-misc/xsnap/xsnap-1.5.10.ebuild +++ b/x11-misc/xsnap/xsnap-1.5.10.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xsnap/xsnap-1.5.10.ebuild,v 1.6 2012/03/19 19:12:51 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xsnap/xsnap-1.5.10.ebuild,v 1.7 2012/12/10 21:03:47 hasufell Exp $ EAPI=4 inherit eutils toolchain-funcs @@ -9,7 +9,7 @@ DESCRIPTION="Program to interactively take a 'snapshot' of a region of the scree HOMEPAGE="ftp://ftp.ac-grenoble.fr/ge/Xutils/" SRC_URI="ftp://ftp.ac-grenoble.fr/ge/Xutils/${P}.tar.bz2" -LICENSE="as-is" +LICENSE="GPL-3+" SLOT="0" KEYWORDS="amd64 ppc x86 ~amd64-linux" IUSE="" diff --git a/x11-misc/xsnap/xsnap-1.5.6.ebuild b/x11-misc/xsnap/xsnap-1.5.6.ebuild deleted file mode 100644 index cf99532159e2..000000000000 --- a/x11-misc/xsnap/xsnap-1.5.6.ebuild +++ /dev/null @@ -1,49 +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/xsnap/xsnap-1.5.6.ebuild,v 1.8 2012/03/19 19:12:51 armin76 Exp $ - -EAPI=2 -inherit eutils toolchain-funcs - -DESCRIPTION="Program to interactively take a 'snapshot' of a region of the screen" -HOMEPAGE="ftp://ftp.ac-grenoble.fr/ge/Xutils/" -SRC_URI="ftp://ftp.ac-grenoble.fr/ge/Xutils/${P}.tar.bz2" - -LICENSE="as-is" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="" - -COMMON_DEPEND="x11-libs/libX11 - x11-libs/libXext - x11-libs/libXpm - media-libs/libpng - virtual/jpeg" -RDEPEND="${COMMON_DEPEND} - media-fonts/font-misc-misc" -DEPEND="${COMMON_DEPEND} - x11-proto/xproto - app-text/rman - x11-misc/imake" - -src_prepare() { - epatch "${FILESDIR}"/${P}-gentoo.patch - xmkmf || die - sed -i \ - -e '/ CC = /d' \ - -e '/ LD = /d' \ - -e '/ CDEBUGFLAGS = /d' \ - -e '/ CCOPTIONS = /d' \ - -e 's|CPP = cpp|CPP = $(CC)|g' \ - Makefile || die -} - -src_compile() { - tc-export CC - emake CCOPTIONS="${CFLAGS}" EXTRA_LDOPTIONS="${LDFLAGS}" || die -} - -src_install() { - emake DESTDIR="${D}" install install.man || die - dodoc README AUTHORS -} diff --git a/x11-misc/xsnap/xsnap-1.5.9.ebuild b/x11-misc/xsnap/xsnap-1.5.9.ebuild index 9f15ea5ebcea..7b39939421e5 100644 --- a/x11-misc/xsnap/xsnap-1.5.9.ebuild +++ b/x11-misc/xsnap/xsnap-1.5.9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xsnap/xsnap-1.5.9.ebuild,v 1.2 2012/03/19 19:12:51 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xsnap/xsnap-1.5.9.ebuild,v 1.3 2012/12/10 21:03:47 hasufell Exp $ EAPI=4 inherit eutils toolchain-funcs @@ -9,7 +9,7 @@ DESCRIPTION="Program to interactively take a 'snapshot' of a region of the scree HOMEPAGE="ftp://ftp.ac-grenoble.fr/ge/Xutils/" SRC_URI="ftp://ftp.ac-grenoble.fr/ge/Xutils/${P}.tar.bz2" -LICENSE="as-is" +LICENSE="GPL-3+" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" IUSE="" |