Use the X flag to pull the media-gfx/scrot package for screenshots. Bug #515538. Drop old packages

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 09BF4F54C2BA7F3C!)

7 files changed, 25 insertions, 76 deletions

diff --git a/app-misc/screenfetch/ChangeLog b/app-misc/screenfetch/ChangeLog
index 7ef00b854f5b..51339cb33c62 100644
--- a/app-misc/screenfetch/ChangeLog
+++ b/app-misc/screenfetch/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/screenfetch
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/screenfetch/ChangeLog,v 1.10 2013/11/23 13:22:07 hwoarang Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screenfetch/ChangeLog,v 1.11 2014/07/12 13:24:33 hwoarang Exp $
+
+  12 Jul 2014; Markos Chandras <hwoarang@gentoo.org> -screenfetch-2.9.0.ebuild,
+  -screenfetch-3.0.5.ebuild, metadata.xml, screenfetch-2.7.7.ebuild,
+  screenfetch-3.2.2.ebuild, screenfetch-9999.ebuild:
+  Use the X flag to pull the media-gfx/scrot package for screenshots. Bug
+  #515538. Drop old packages
 
 *screenfetch-3.2.2 (23 Nov 2013)
 
diff --git a/app-misc/screenfetch/metadata.xml b/app-misc/screenfetch/metadata.xml
index 7d3738d1efc9..fb77a4a353c4 100644
--- a/app-misc/screenfetch/metadata.xml
+++ b/app-misc/screenfetch/metadata.xml
@@ -5,5 +5,8 @@
 <email>hwoarang@gentoo.org</email>
 <name>Markos Chandras</name>
 </maintainer>
+<use>
+<flag name="X">Use the <pkg>media-gfx/scrot</pkg> package to take screenshots</flag>
+</use>
 </pkgmetadata>
 
diff --git a/app-misc/screenfetch/screenfetch-2.7.7.ebuild b/app-misc/screenfetch/screenfetch-2.7.7.ebuild
index 04e1ee706598..5985d301aad5 100644
--- a/app-misc/screenfetch/screenfetch-2.7.7.ebuild
+++ b/app-misc/screenfetch/screenfetch-2.7.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/screenfetch/screenfetch-2.7.7.ebuild,v 1.2 2013/06/02 20:42:14 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screenfetch/screenfetch-2.7.7.ebuild,v 1.3 2014/07/12 13:24:33 hwoarang Exp $
 
 EAPI=4
 
@@ -12,10 +12,10 @@ SRC_URI="http://github.com/KittyKatt/${MY_PN}/zipball/v${PV} -> ${P}.zip"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
+IUSE="X"
 
 DEPEND="app-arch/unzip"
-RDEPEND="media-gfx/scrot
+RDEPEND="X? ( media-gfx/scrot )
 	x11-apps/xdpyinfo"
 
 GIT_HASH="4881270"
diff --git a/app-misc/screenfetch/screenfetch-2.9.0.ebuild b/app-misc/screenfetch/screenfetch-2.9.0.ebuild
deleted file mode 100644
index 952da8547ba5..000000000000
--- a/app-misc/screenfetch/screenfetch-2.9.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/screenfetch/screenfetch-2.9.0.ebuild,v 1.1 2013/06/02 20:41:37 hwoarang Exp $
-
-EAPI=4
-
-MY_PN="${PN/f/F}"
-DESCRIPTION="A Bash Screenshot Information Tool"
-HOMEPAGE="https://github.com/KittyKatt/screenFetch"
-SRC_URI="http://github.com/KittyKatt/${MY_PN}/zipball/v${PV} -> ${P}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND="media-gfx/scrot
-	x11-apps/xdpyinfo"
-
-GIT_HASH="41673d6"
-S="${WORKDIR}"/KittyKatt-${MY_PN}-${GIT_HASH}
-
-src_install() {
-	dobin ${PN}-dev
-	# also known as screenfetch
-	dosym ${PN}-dev /usr/bin/${PN}
-	dodoc CHANGELOG README.mkdn TODO
-}
diff --git a/app-misc/screenfetch/screenfetch-3.0.5.ebuild b/app-misc/screenfetch/screenfetch-3.0.5.ebuild
deleted file mode 100644
index 75c2795c54d7..000000000000
--- a/app-misc/screenfetch/screenfetch-3.0.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/screenfetch/screenfetch-3.0.5.ebuild,v 1.1 2013/08/30 23:52:45 hwoarang Exp $
-
-EAPI=4
-
-MY_PN="${PN/f/F}"
-DESCRIPTION="A Bash Screenshot Information Tool"
-HOMEPAGE="https://github.com/KittyKatt/screenFetch"
-if [[ ${PV} == *9999* ]]; then
-	inherit git-2
-	EGIT_REPO_URI="https://github.com/KittyKatt/screenFetch"
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/KittyKatt/${MY_PN}/archive/v${PV}.tar.gz -> \
-		${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${MY_PN}-${PV}"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-RDEPEND="media-gfx/scrot
-	x11-apps/xdpyinfo"
-
-src_install() {
-	dobin ${PN}-dev
-	# also known as screenfetch
-	dosym ${PN}-dev /usr/bin/${PN}
-	dodoc CHANGELOG README.mkdn TODO
-}
diff --git a/app-misc/screenfetch/screenfetch-3.2.2.ebuild b/app-misc/screenfetch/screenfetch-3.2.2.ebuild
index 90e595f976f1..80a8ceb06c30 100644
--- a/app-misc/screenfetch/screenfetch-3.2.2.ebuild
+++ b/app-misc/screenfetch/screenfetch-3.2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/screenfetch/screenfetch-3.2.2.ebuild,v 1.1 2013/11/23 13:22:07 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screenfetch/screenfetch-3.2.2.ebuild,v 1.2 2014/07/12 13:24:33 hwoarang Exp $
 
 EAPI=4
 
@@ -20,9 +20,10 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
+IUSE="X"
 
-RDEPEND="media-gfx/scrot
+DEPEND=""
+RDEPEND="X? ( media-gfx/scrot )
 	x11-apps/xdpyinfo"
 
 src_install() {
diff --git a/app-misc/screenfetch/screenfetch-9999.ebuild b/app-misc/screenfetch/screenfetch-9999.ebuild
index faf30611c9ec..8cd78c29c218 100644
--- a/app-misc/screenfetch/screenfetch-9999.ebuild
+++ b/app-misc/screenfetch/screenfetch-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/screenfetch/screenfetch-9999.ebuild,v 1.2 2013/11/23 13:22:07 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screenfetch/screenfetch-9999.ebuild,v 1.3 2014/07/12 13:24:33 hwoarang Exp $
 
 EAPI=4
 
@@ -20,9 +20,10 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
+IUSE="X"
 
-RDEPEND="media-gfx/scrot
+DEPEND=""
+RDEPEND="X? ( media-gfx/scrot )
 	x11-apps/xdpyinfo"
 
 src_install() {