Close bug #420557 - No gtk3 use flag used anymore

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x2EDD52403B68AF47

4 files changed, 24 insertions, 160 deletions

diff --git a/net-p2p/eiskaltdcpp/ChangeLog b/net-p2p/eiskaltdcpp/ChangeLog
index 0e7c3fed51e6..994a4b992b33 100644
--- a/net-p2p/eiskaltdcpp/ChangeLog
+++ b/net-p2p/eiskaltdcpp/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-p2p/eiskaltdcpp
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/eiskaltdcpp/ChangeLog,v 1.57 2013/12/24 12:50:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/eiskaltdcpp/ChangeLog,v 1.58 2013/12/31 21:24:40 swift Exp $
+
+  31 Dec 2013; Sven Vermeulen <swift@gentoo.org> -eiskaltdcpp-2.2.7.ebuild,
+  metadata.xml:
+  USE=gnome not used by this package
+
+  31 Dec 2013; Sven Vermeulen <swift@gentoo.org> -eiskaltdcpp-2.2.7.ebuild,
+  metadata.xml:
+  Remove 2.2.7 from tree, closes #420557
 
   24 Dec 2013; Agostino Sarubbo <ago@gentoo.org> eiskaltdcpp-2.2.9.ebuild:
   Stable for x86, wrt bug #487658
diff --git a/net-p2p/eiskaltdcpp/Manifest b/net-p2p/eiskaltdcpp/Manifest
index d2f57f5ab538..173975e782ba 100644
--- a/net-p2p/eiskaltdcpp/Manifest
+++ b/net-p2p/eiskaltdcpp/Manifest
@@ -3,30 +3,28 @@ Hash: SHA256
 
 AUX eiskaltdcpp-2.2.7-boost-1.50.patch 686 SHA256 a70bf4b74d7ce33e67b3ecad89c72533cb00b3bb1fce3e04cd8eaee39458ee03 SHA512 65c812cdcfcac8834f4d83a07ebde019c2c54d33f64eaecd0c6f21862516655acce8c2a68dafde330d87d8cbf4b7b9170237151e65dac50d67f9bfd569bd8248 WHIRLPOOL 9b4797579db10d8b6f4d57c03b96e1ee2cbbb364b87270e440f7fb50f3d2e428dfca2ff39d1aea3299c493d834911d1002dc4abfeb5ab149dd66322bee9e649e
 AUX eiskaltdcpp-2.2.8-sr-latin.patch 791 SHA256 c9803a270bbf08e3893164b86590a5df149b0b0057df6a96670adb925de38767 SHA512 892dd3bb36e776b752a2b0cebe37d6f071d767928d0dd90948879fcc90229fac559a8742f6d387d3d11d87a13862bc595a2835034ccefefd1cbc87df676dee46 WHIRLPOOL 13c1e94b55ff6feb79fc7bc7be114b4863fafb5d90f9b25066c56dc365c86bc6cbed4521c5db90034491e4912a3fc8a1369a4129f2c26bb8714ddac26e0db730
-DIST eiskaltdcpp-2.2.7.tar.xz 2195324 SHA256 23f7855cccace4a6f1c90774033417838aab6771c6b5b10c7362bfbd670de8ad SHA512 1947db1023b974919fbba2b91472dafa43ffb6634de1df6e1ae110802f7298ae606b145be72a777f7044874709d7856d88572da03097d0251272f3facda16366 WHIRLPOOL 7403682c6f49689dd037a3939c9459faa73cfe96b97ae725a5c367c5bbbba71a0c69a18a691aeca6ac9d15add7e6d6db37d7be86f4cd1aa553be8e3eb510cc06
 DIST eiskaltdcpp-2.2.8.tar.xz 2270452 SHA256 5a84f9c360a4cfa59f54769dbc5fca0779be1439c5d338a6b05691dac6869fe3 SHA512 cf7d98bf28730edfe81dc0c4020b915de5b9594aecdcbb81734551b6b818ee13918b4e6c13cd9a6ac4a158529827e13b683cdd26e193693750c92d71c7e16511 WHIRLPOOL 0a3a8a85434c413a3408b523482949200357069fa0d7f90ff291140ec9b5e4754ecfb2b5a694d0258c089e0f0748ecd73e7ac3cf6c2b98fd0d4071101f55335f
 DIST eiskaltdcpp-2.2.9.tar.xz 2327732 SHA256 3d9170645450f9cb0a605278b8646fec2110b9637910d86fd27cf245cbe24eaf SHA512 0de95d3dcfb860f262073497e8dacc6bb4371d72a13f23bf7981e96203d7361a2e078b45826c12a81cc8fbe8423ee231232e2874a02bcef76f96b516cb7e301c WHIRLPOOL a1ab51ef32a96cb6af5b6988068f93cade26def068509f269eb95a934e07adfddf850e85d1c48eb5fb3ba75cff97d5e4bf6843a4375c099dcb2658be983c008f
-EBUILD eiskaltdcpp-2.2.7.ebuild 3925 SHA256 cbd59d118f0dd69194ba87adcc4ecf7980fd427651c0e388be08affd3d7016b4 SHA512 b7bb4c9c3471ce78775f846174a27eede12c2e4e9631d5baec75e21c935419851902777ed762d2b27619f47231803602ecf544ae795afe17af53b67536dcb243 WHIRLPOOL aa91b6034697ca7a7da1be26c4bd5f80dec667c6812b78b4f24fc6b0724293c2113d1c3e53e0c24d93255ab4374038c8e2e49023d3900908c67ac9b3ec413ac9
 EBUILD eiskaltdcpp-2.2.8-r1.ebuild 3735 SHA256 a213de7c62d3e8ce23553a2dde618b5d8656c9777f7743c86e3f6040e6d8522b SHA512 46134582288656b00e9d054f5150ee40ab76bb9d8434a1c6602dd169a3d0c3fe62176829274cfc5505c3f95aa737ae817217cccd7c4e53146e742586544506c0 WHIRLPOOL a06a804eda706d628264ad9d7dfa07d11b6d7e0ebce9680d17d69da7049869307bb40e3a692ab7307d51a374a4e233202daae7a99f137fe89072c2c087d5f86e
 EBUILD eiskaltdcpp-2.2.8.ebuild 3711 SHA256 ad164f19f107d3be325c236b5d785177457ec92cad09a52f9f6b3b50d549e28a SHA512 103232ff43f657dff53ab174aaf20d5019228e0e2a5c504e9e63e337977e8e2144d21287a4e084946dbb33f9bc839ea8a1beaeedc3e6a6d97011df926a8b9dca WHIRLPOOL bc89e3167e3c6b5071df98050b5ab8525052db21212152badab09cc909d19b9056e0bb60bc596fce96f04dd7dcdc238f38527d64f4f60e4a293070d92134150d
 EBUILD eiskaltdcpp-2.2.9.ebuild 3682 SHA256 e93e28454697eafaa253de4ab9c098d2d6cbd8f0c65f4b41560f73ceb3439035 SHA512 199836364d76c61d4a59189df586d5e9b6330942a9a61dd1f3d87cb3fbc1e2e1808eb3d2aa2d4ac9fb6d3745deeb666d05a551ca6268de3bb216638362159af7 WHIRLPOOL 6ee5211ec16a3ab5ad4f685f49096ec11247d8c81f0b3ebae582bc909c61897dc18f9c53e5bd2cc82dd138ee5a38eba560bd682eb1608fa7f9e7edc3a54af581
 EBUILD eiskaltdcpp-9999.ebuild 3688 SHA256 5904c722a50203785bae0310840673db597c27ed80ca122acfdcd0d95632eed4 SHA512 3b8c77bb81c7f4302f9b2219c3dd0871e2e804c6a96c9f12d8c59c434b2333ad12eb65d54ef4d9b4785f0e94b0cfc08a9a3f0facd0f47b4e05abb77b46a18e87 WHIRLPOOL f885a4a9c86e038f83e7d913ed1424c69f74088de5977f66946ca4d8e73828ca5fc73e66bee79a78fe35e8231a58fc9d4453097c6727b67dba5d7f67d4194a93
-MISC ChangeLog 9755 SHA256 79f8aee8995bec409b0fd5c987a1abd7a1fa2cd69dabc6d278d28f7bfedfc38e SHA512 892aa2ecb61c075f20049e5cb03a97f778bd7d063f2ef930eee48f579da0f867829cba0b2a93ade0b789689901f156fbede901908d3cb7e4e9248509a7772ca5 WHIRLPOOL cf5a2ccb3983ca0fe93c00a0a4e6bda4696e23d9ebe269a99ab5429dfee3e038129c0f112d0ee6e141a6e8650b106ac5fec16aacf7c01ef609035e760c47bb4f
-MISC metadata.xml 1218 SHA256 3a869996b0f36eb98d91626837e0564831f09676425813d2cbf53a8dea59b658 SHA512 9996a8e0ca3d0e124994c32459bcd69c55795d24eaaffd6d5bdb37aa5394abb118dbac0a80407464c0c64f2217e4845f5a96e0a2457f8b17389eac09b0716a93 WHIRLPOOL 6d1598b236b3080c9e3d1d9d62c4885ae8ec5dfa135d49a033f80e63324549de517b5b86ac0b4a986ea319706293beb859b452c66832e5864c82baec83609425
+MISC ChangeLog 10021 SHA256 6e0519e72dbe5d9fd3b5d99e209c162a340928f267cb6fee843f2b053bc0b157 SHA512 a41d7c5e3a4deb4d2c3922115e0b9dfe6243166a15725e4c5424795a1844d75b15aea4b1482f3a238fb9796549b50c48ffcaa2bce42bc5e002bacbd4addc0004 WHIRLPOOL 9d5ed695ae2b85bb364b291f47c51cf56239f5cf0340339755fb4e0476bff99073c2d832f1f7b02d34642c503cc141900fdf76a27fc7fd3df528a0323e4d424a
+MISC metadata.xml 1047 SHA256 4b4550c2e7eb8d1f51cf3f24568d911a437f2ea9336e8cdd88bb880592f48cfe SHA512 e139109f9a03a089b91525bc4ed3e890703961d94c8b1ad645336daf0fc22e49f2ae578977c375a0a7a1358ed8c83d8ad8d54477e9f27320c05e12585cad81a2 WHIRLPOOL 81ff02be460919538dbc27ad8262d570f0998c28b886ce9a1d670a7ba038fceffb1820931de9c7991a24a7a6ab88e9d752df4dd10f2295e9496a8588add87b75
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSuYMxAAoJELp701BxlEWfcQ4P/jOIL40KNglNspAV5W7BfObg
-Dd2Rq670cpFfOgfR/PL1hq4v2zicZl+4M3Pxn+5NWCJNb5tHrOZ8Vx2kiMprLyYJ
-1eyYjesxqRrzEdAzKGGkQo5gu6P4boZBWLzzH3rZAQOQ4tjFrCGlgvNiLWduAQ21
-HXkaQCOPm4ZAnrKMe8NmpECvGCiQY5MAbMPhjFmRzUYbh1eVCW/7AW+CQFiiqfH4
-hOX3p37pDpE3nN0L0la4KnPkU43GGvhD/CRZmt2sliIxw2+YTB6aN6kOQtv5sNDO
-YkqCNE5OOCsRKopqdMadXXDG2qFruXvejQUWrihbWtfcZv/dIt1FlWtNIRj69gZY
-zSc4bmtTfzupDBhmSR6BCdytClK17WDhvTec42riSnt+MA6Wq/QVVDvjSgAzjTHs
-n3tLoh9NNzY4dtqxC5Gr2IKSs+mL4huay0iVc7D8urGgomvgFYPFc+SqVTxajxaJ
-whvAXyCM/WCMd9+1p/bkH6jMd8n7IEqe/ZCQ0jMFEnv84eTaSRUy+yOddxWRtrrq
-E/7AYmCxtCHkC1W8Kv1RUF4TIsLb9SzV8C2HFYPzy3+OumklaPT/NbZtYaPNJ071
-vM5CgT3UbSDq/qOkqrwwpJ4er6Y8zaQSz4RiHQCEIc5llmVFx2kuLmNfQRdAX5lz
-oK+EZ8qLqTO3Fi6sfKHu
-=y7fa
+iQIcBAEBCAAGBQJSwzWrAAoJEC7dUkA7aK9H9rYQAJIh8w8to7cMkXbEd43rKR/N
+HbDVXezT51po/kR/8s0HBUn+zH02Jb7gPj1UqpuNB0UFZ7jj2iXVexmGRL+uyTLt
+dDjOvMuieZtKXm2NSvKW0ba1yh+IZ8cjrajBqMYTtnhbAN/7bXSenbXPGT5dJzD9
+b7NURpdmEqY5y6Wb1R2CsiWESLoLQoU2WqkDQVWXD0LsC99oJUKaTHQspwauWUaS
+prq0xz7WbcBxffYMf+Lt4cja0JXQGhFNwfcmMuYd3QnIdQsHd0eLRAXEHqmcj5m7
+NcJ4DGk03d6vShGUFNiGXkzQBXbVMtTuMofWql/UgZVBymjMLYcdqEsm1YwaCXpn
+expWTjH5+PNlQMJR/lioEvK2M7f8JcWYNvgbrWaa5eu0pB1gu1FlKFMwqm+jTi3h
+cDKH5BS/TWfP3XF+iu8rS/muIoyqxT4yyFfIXVYv4WuIK7nyUQnyb2JZt2aAO+Dq
+aYFPtUHW2uR6PQf96ZlXK8pg6ziGMqOKp6lYPM70thgY7kPS+N2jgW06mbaML+bl
+bOu+fmKW4PZVp5b0wvH5kb5Y7Z5ZWkT1m9AWrFC30AYra23EoIeEcKfZOI/4zYbS
+5dwNmrvf1b87LfPAab8mmes+EWbFbYerihGF+5UDe7r35DT7B9cMYGbFZTTdc5rb
+Kj/jjS4pJme4YsgCfR5L
+=eyZz
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.7.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.7.ebuild
deleted file mode 100644
index 9277584b6ea4..000000000000
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.7.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.7.ebuild,v 1.10 2013/09/04 18:53:49 pinkbyte Exp $
-
-EAPI="4"
-
-LANGS="be bg cs de el en es fr hu it pl ru sk uk" # drop sr@latin for bug #429786
-
-[[ ${PV} = *9999* ]] && VCS_ECLASS="git-2" || VCS_ECLASS=""
-inherit cmake-utils ${VCS_ECLASS}
-
-DESCRIPTION="Qt4 based client for DirectConnect and ADC protocols, based on DC++ library"
-HOMEPAGE="http://eiskaltdc.googlecode.com/"
-
-LICENSE="GPL-2 GPL-3"
-SLOT="0"
-IUSE="cli daemon dbus +dht +emoticons examples -gnome -gtk -gtk3 idn -javascript json libcanberra libnotify lua +minimal pcre +qt4 sound spell sqlite upnp xmlrpc"
-for x in ${LANGS}; do
-	IUSE="${IUSE} linguas_${x}"
-done
-
-REQUIRED_USE="
-	cli? ( ^^ ( json xmlrpc ) )
-	emoticons? ( || ( gtk qt4 ) )
-	dbus? ( qt4 )
-	gnome? ( gtk )
-	gtk3? ( gtk )
-	javascript? ( qt4 )
-	json? ( !xmlrpc )
-	libcanberra? ( !gnome gtk )
-	libnotify? ( gtk )
-	spell? ( qt4 )
-	sound? ( || ( gtk qt4 ) )
-	sqlite? ( qt4 )
-"
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="http://${PN/pp/}.googlecode.com/files/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-else
-	EGIT_REPO_URI="git://github.com/negativ/${PN}.git"
-	KEYWORDS=""
-fi
-
-RDEPEND="
-	app-arch/bzip2
-	>=dev-libs/boost-1.38
-	>=dev-libs/openssl-0.9.8
-	sys-apps/attr
-	sys-devel/gettext
-	sys-libs/zlib
-	virtual/libiconv
-	idn? ( net-dns/libidn )
-	lua? ( >=dev-lang/lua-5.1 )
-	pcre? ( >=dev-libs/libpcre-4.2 )
-	upnp? ( >=net-libs/miniupnpc-1.6 )
-	cli? (
-		>=dev-lang/perl-5.10
-		perl-core/Getopt-Long
-		dev-perl/Data-Dump
-		dev-perl/Term-ShellUI
-		json? ( dev-perl/JSON-RPC )
-		xmlrpc? ( dev-perl/RPC-XML )
-	)
-	daemon? ( xmlrpc? ( >=dev-libs/xmlrpc-c-1.19.0[abyss,cxx] ) )
-	gtk? (
-		x11-libs/pango
-		gtk3? ( x11-libs/gtk+:3 )
-		!gtk3? ( >=x11-libs/gtk+-2.24:2 )
-		>=dev-libs/glib-2.24:2
-		x11-themes/hicolor-icon-theme
-		gnome? ( gnome-base/libgnome )
-		libcanberra? ( media-libs/libcanberra )
-		libnotify? ( >=x11-libs/libnotify-0.4.1 )
-	)
-	qt4? (
-		>=dev-qt/qtgui-4.6.0:4
-		dbus? ( >=dev-qt/qtdbus-4.6.0:4 )
-		javascript? (
-			dev-qt/qtscript:4
-			x11-libs/qtscriptgenerator
-		)
-		spell? ( app-text/aspell )
-		sqlite? ( dev-qt/qtsql:4[sqlite] )
-	)
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-DOCS="AUTHORS ChangeLog.txt"
-
-PATCHES=( "${FILESDIR}"/${P}-boost-1.50.patch )
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		[[ $(gcc-major-version) -lt 4 ]] || \
-				( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 4 ]] ) \
-			&& die "Sorry, but gcc-4.4 and earlier won't work."
-	fi
-}
-
-src_configure() {
-	# linguas
-	local langs x
-	for x in ${LANGS}; do
-		use linguas_${x} && langs+=" ${x}"
-	done
-
-	local mycmakeargs=(
-		-DLIB_INSTALL_DIR="$(get_libdir)"
-		-Dlinguas="${langs}"
-		-DLOCAL_MINIUPNP=OFF
-		"$(use cli && cmake-utils_use json USE_CLI_JSONRPC)"
-		"$(use cli && cmake-utils_use xmlrpc USE_CLI_XMLRPC)"
-		"$(cmake-utils_use daemon NO_UI_DAEMON)"
-		"$(use daemon && cmake-utils_use json JSONRPC_DAEMON)"
-		"$(use daemon && cmake-utils_use xmlrpc XMLRPC_DAEMON)"
-		"$(cmake-utils_use dbus DBUS_NOTIFY)"
-		"$(cmake-utils_use dht WITH_DHT)"
-		"$(cmake-utils_use emoticons WITH_EMOTICONS)"
-		"$(cmake-utils_use examples WITH_EXAMPLES)"
-		"$(cmake-utils_use gnome USE_LIBGNOME2)"
-		"$(cmake-utils_use gtk USE_GTK)"
-		"$(cmake-utils_use gtk3 USE_GTK3)"
-		"$(cmake-utils_use idn USE_IDNA)"
-		"$(cmake-utils_use javascript USE_JS)"
-		"$(cmake-utils_use libcanberra LIBCANBERRA)"
-		"$(cmake-utils_use libnotify USE_LIBNOTIFY)"
-		"$(cmake-utils_use lua LUA_SCRIPT)"
-		"$(cmake-utils_use lua WITH_LUASCRIPTS)"
-		"$(cmake-utils_use !minimal WITH_DEV_FILES)"
-		"$(cmake-utils_use pcre PERL_REGEX)"
-		"$(cmake-utils_use qt4 USE_QT)"
-		"$(cmake-utils_use sound WITH_SOUNDS)"
-		"$(cmake-utils_use spell USE_ASPELL)"
-		"$(cmake-utils_use sqlite USE_QT_SQLITE)"
-		"$(cmake-utils_use upnp USE_MINIUPNP)"
-	)
-	cmake-utils_src_configure
-}
diff --git a/net-p2p/eiskaltdcpp/metadata.xml b/net-p2p/eiskaltdcpp/metadata.xml
index 2041198f26d6..22fd8fd7bb0a 100644
--- a/net-p2p/eiskaltdcpp/metadata.xml
+++ b/net-p2p/eiskaltdcpp/metadata.xml
@@ -17,8 +17,6 @@
   <flag name="daemon">Enable eiskaltdcpp-daemon</flag>
   <flag name="dht">Enable DHT (distributed hash table) support for libeiskaltdcpp</flag>
   <flag name="emoticons">Install emoticon packs</flag>
-  <flag name="gnome">Enable sound notifications support over libgnome2 in EiskaltDC++ Gtk</flag>
-  <flag name="gtk3">Use x11-libs/gtk+:3 instead of x11-libs/gtk+:2</flag>
   <flag name="json">Enable JSON for cli and daemon</flag>
   <flag name="libcanberra">Enable sound notifications support over libcanberra in EiskaltDC++ Gtk</flag>
   <flag name="minimal">Don't install headers</flag>