old

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64

4 files changed, 6 insertions, 133 deletions

diff --git a/games-puzzle/connectagram/ChangeLog b/games-puzzle/connectagram/ChangeLog
index 0a5def9e4c15..b86d307d9bce 100644
--- a/games-puzzle/connectagram/ChangeLog
+++ b/games-puzzle/connectagram/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-puzzle/connectagram
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/connectagram/ChangeLog,v 1.9 2014/08/26 05:37:35 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/connectagram/ChangeLog,v 1.10 2014/08/29 17:16:14 mr_bones_ Exp $
+
+  29 Aug 2014; Michael Sterrett <mr_bones_@gentoo.org>
+  -connectagram-1.1.1.ebuild, -files/connectagram-1.1.1-gentoo.patch:
+  old
 
 *connectagram-1.1.2 (26 Aug 2014)
 
diff --git a/games-puzzle/connectagram/Manifest b/games-puzzle/connectagram/Manifest
index c78d46be49c6..92274ecd3cf5 100644
--- a/games-puzzle/connectagram/Manifest
+++ b/games-puzzle/connectagram/Manifest
@@ -1,10 +1,7 @@
-AUX connectagram-1.1.1-gentoo.patch 2536 SHA256 06756eaf8a8ed0ee2981bbfc646786c73cc3c588dc338ead8ae116174d6c37e8 SHA512 d0bcda5bcbe66d6664d7e1f30daa591caeb6b938e182844491636487a815d73510739a0da0da8a9190cdeeac7e3ee93e80410722539d542e7cee0353350697d9 WHIRLPOOL 4497825ba0e538292f265ef217559d1bd0f8c877ad5709f5736a83d8d5a932ef894b6727a81f0c8af7d0b7adbb94f9a1adec785c49b12aa9ccb33de220f025cc
 AUX connectagram-1.1.2-gentoo.patch 2536 SHA256 06756eaf8a8ed0ee2981bbfc646786c73cc3c588dc338ead8ae116174d6c37e8 SHA512 d0bcda5bcbe66d6664d7e1f30daa591caeb6b938e182844491636487a815d73510739a0da0da8a9190cdeeac7e3ee93e80410722539d542e7cee0353350697d9 WHIRLPOOL 4497825ba0e538292f265ef217559d1bd0f8c877ad5709f5736a83d8d5a932ef894b6727a81f0c8af7d0b7adbb94f9a1adec785c49b12aa9ccb33de220f025cc
 DIST connectagram-1.0.1-src.tar.bz2 263808 SHA256 6d3696b69f09eda26cdd2a42fe4d91de3effc4757c68f5109b19c1d4d6510e37 SHA512 747a34c7f42a7ac4b09178bc10d17124429d06d257b9e6f25cf800ecb2c06037611871c45bc67c17eda690ea77bba7c59661d1730a3bd01fb0aa0ccd82244aeb WHIRLPOOL 70b126c2b7e0a8d96f6b447348196549163bc90a47049bde2801bbe06feddfdc3ecd43ae688b333719a8292984ca0a10813fe7d94aa19ccfdc03530e97550a58
-DIST connectagram-1.1.1-src.tar.bz2 787725 SHA256 734c610a59d043a13edb6d7301cc9e72704663128cd95370ba22ae12da4796fb SHA512 ee9e1ab0a3b8d2f5fdbd6eebebc7c4859dc21a05154bcf3436fd79b677341da514f94289553a00da458c35df83b52a0db966c9e3ba977184211daeb5f7b872f9 WHIRLPOOL 6f38a0c36ffb21fb74c78790785868d93a7f411f67bf71bc99632f5aac788ac91de9ba2fef0f360f4994abdcd2e49caed5712086747665fbf1fb40e65d131697
 DIST connectagram-1.1.2-src.tar.bz2 1415066 SHA256 06e03fed6d7651383cf8d771d0e89e09bb149c0aef431c1374296e62319087c4 SHA512 1dcc7b5a7992ed8656614ca9d86207574d0cd4557a02a0688b1572740d3f3f496f587705647dac9bc7c616491ee0800ca925aa5218769159da58f24f696dddda WHIRLPOOL b33b5644ef7f3b5b5c352c31ebde5515b7edb3bb5e42bc77cd9261d28284c2e81e097f98b54ac5bf6cce7fe2ff3cf6df6bd82d8af85f388feced0fcf37d75f58
 EBUILD connectagram-1.0.1-r1.ebuild 1026 SHA256 d011945734adcc25263b2077da4780fe93d44aeddfa9b1218973e156c2c7b013 SHA512 1ea721ea99bcd2ae00bc85a281824b319cd288457a0956a6b4f903a3f8221369fd6f818ba265c1dd1170b4b84a87ac11a2853c0a1de1554b5b2e50c7b8d88c1e WHIRLPOOL ec3738986009b72bc97eaf8595dec194e40193c9958c68e6f56ed1ae9892a7063c9d7700ad30d8690c7468415516b84a8a7402c4f930b616c3ff94aebaf2dfc7
-EBUILD connectagram-1.1.1.ebuild 1080 SHA256 453e0bfe27b145cbb6b7b3512952d33b5246a079875d248c0752c8cd0a2632ed SHA512 b06aeed13544a0ff0b45748ee4ab0c462add81d57acb6caff065df454f6b8df5c9169711e30e1d5996ff431119752f91295dd3dc59a3433b43cc68378813609b WHIRLPOOL f563204120509673a23e46a7834ea9cbaf91d37f41255cc2125b656b101179960a5e1c6c776b84f5800e18725b923e6db7a4f3518a09c37c2b9a037245a6f71f
 EBUILD connectagram-1.1.2.ebuild 1080 SHA256 a83b86f5ee6d22374de0990e58de02acc6c29ef02c1890555c2c643cc433ce31 SHA512 a641fb462fd8e01dfd5738777ab31dd48f28dfcbbd103f4d7f9a4c2145d36e272fa846aa1b137a7e10fc1b4058392a9afd4b4f7ec67566aab6bee5146212bc20 WHIRLPOOL fea5c30a841feabd7106598a7397fd9e418e5fdd8830c06284d77cac77ad13aaa8cd007dd5cc4f492639c360d132d7234646397727d3a4b6ecaf16049fca2fb5
-MISC ChangeLog 1727 SHA256 df61ca57f4816a7ba9224d34be94fa7ee1412c4853414ddc181a3bdb1668ecfd SHA512 d9e4b6ba12ef3b61db03e15dd4d36b36815a32f9097e7c35070724744f48419ec2b1b9a382ed4fc35326dde3f86b48600fa8d2f82ae17a5007ed1fdcd91588f7 WHIRLPOOL fe6a99ce28aaeb238c5549a5fb883cc064dba969afd15b5452192f84c04bd292bd145e21b6720c858496a8dab45bb96ed21d67e0b2db2a43a1682cf81da82287
+MISC ChangeLog 1860 SHA256 49fb80d3f3a00d9daec8b8ffa911dd7a2bfc949b9ed6cf19a492397d4bb3f3c6 SHA512 cf4ec3153178ad89591082644dbd4b54a8019b2f90a108089d8ca15413a7f7d80f155f841d4437e3a19832c2d3d791613d2dd6bbe7744449fc9a8583e9b18277 WHIRLPOOL fbe32aabb6ce807fd9278edf4f2eed71fce6b58b1829b4499cef5864ed8bffb1de5d985be75e60c9ebdd3c03b4aeaf2f9488f5b9be39f499687489081e8f2431
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
diff --git a/games-puzzle/connectagram/connectagram-1.1.1.ebuild b/games-puzzle/connectagram/connectagram-1.1.1.ebuild
deleted file mode 100644
index 4977c20b90cf..000000000000
--- a/games-puzzle/connectagram/connectagram-1.1.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/connectagram/connectagram-1.1.1.ebuild,v 1.1 2014/02/05 07:14:44 mr_bones_ Exp $
-
-EAPI=5
-inherit eutils gnome2-utils qt4-r2 games
-
-DESCRIPTION="A word unscrambling game"
-HOMEPAGE="http://gottcode.org/connectagram/"
-SRC_URI="http://gottcode.org/${PN}/${P}-src.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-qt/qtcore-4.6:4
-	>=dev-qt/qtgui-4.6:4"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-
-	sed -i \
-		-e "s#@GAMES_BINDIR@#${GAMES_BINDIR}#" \
-		-e "s#@GAMES_DATADIR@#${GAMES_DATADIR}#" \
-		${PN}.pro src/{locale_dialog,new_game_dialog,wordlist}.cpp || die
-}
-
-src_configure() {
-	qt4-r2_src_configure
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	dodoc ChangeLog
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-	games_pkg_preinst
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	games_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-puzzle/connectagram/files/connectagram-1.1.1-gentoo.patch b/games-puzzle/connectagram/files/connectagram-1.1.1-gentoo.patch
deleted file mode 100644
index 8aae286bd427..000000000000
--- a/games-puzzle/connectagram/files/connectagram-1.1.1-gentoo.patch
+++ /dev/null
@@ -1,76 +0,0 @@
---- connectagram-1.1.1.orig/connectagram.pro
-+++ connectagram-1.1.1/connectagram.pro
-@@ -70,16 +70,16 @@
- 
- unix: !macx {
- 	isEmpty(PREFIX) {
--		PREFIX = /usr/local
-+		PREFIX = /usr
- 	}
- 	isEmpty(BINDIR) {
--		BINDIR = bin
-+		BINDIR = @GAMES_BINDIR@
- 	}
- 
--	target.path = $$PREFIX/$$BINDIR/
-+	target.path = @GAMES_BINDIR@/
- 
- 	data.files = data
--	data.path = $$PREFIX/share/connectagram/
-+	data.path = @GAMES_DATADIR@/connectagram/
- 
- 	pixmap.files = icons/connectagram.xpm
- 	pixmap.path = $$PREFIX/share/pixmaps/
-@@ -91,7 +91,7 @@
- 	desktop.path = $$PREFIX/share/applications/
- 
- 	qm.files = translations/*.qm
--	qm.path = $$PREFIX/share/connectagram/translations
-+	qm.path = @GAMES_DATADIR@/connectagram/translations/
- 
- 	INSTALLS += target pixmap icon desktop data qm
- }
---- connectagram-1.1.1.orig/src/locale_dialog.cpp
-+++ connectagram-1.1.1/src/locale_dialog.cpp
-@@ -87,6 +87,7 @@
- 		paths.append(appdir);
- 		paths.append(appdir + "/../share/" + QCoreApplication::applicationName().toLower());
- 		paths.append(appdir + "/../Resources");
-+		paths.append("@GAMES_DATADIR@/connectagram");
- 	}
- 	foreach (const QString& path, paths) {
- 		if (QFile::exists(path + "/translations/")) {
---- connectagram-1.1.1.orig/src/new_game_dialog.cpp
-+++ connectagram-1.1.1/src/new_game_dialog.cpp
-@@ -48,7 +48,7 @@
- 	m_wordlist = new WordList(this);
- 	m_wordlist->setLanguage(WordList::defaultLanguage());
- 	m_languages_box = new QComboBox(this);
--	QStringList languages = QDir("connectagram:").entryList(QDir::Dirs | QDir::NoDotAndDotDot);
-+	QStringList languages = QDir("@GAMES_DATADIR@/connectagram/data").entryList(QDir::Dirs | QDir::NoDotAndDotDot);
- 	foreach (const QString& language, languages) {
- 		m_languages_box->addItem(LocaleDialog::languageName(language), language);
- 	}
---- connectagram-1.1.1.orig/src/wordlist.cpp
-+++ connectagram-1.1.1/src/wordlist.cpp
-@@ -91,9 +91,9 @@
- 
- QString WordList::defaultLanguage() {
- 	QString language = QLocale().name();
--	if (!QFile::exists("connectagram:" + language)) {
-+	if (!QFile::exists("@GAMES_DATADIR@/connectagram/data/" + language)) {
- 		language = language.left(2);
--		if (!QFile::exists("connectagram:" + language)) {
-+		if (!QFile::exists("@GAMES_DATADIR@/connectagram/data/" + language)) {
- 			language = "en";
- 		}
- 	}
-@@ -112,7 +112,7 @@
- 	m_maximum_length(0)
- {
- 	// Read words from disk
--	QFile file("connectagram:" + language + "/words");
-+	QFile file("@GAMES_DATADIR@/connectagram/data/" + language + "/words");
- 	if (!file.open(QFile::ReadOnly | QIODevice::Text)) {
- 		return;
- 	}