Rename 0.74 as 0.7.4 to match upstream versioning scheme.

Package-Manager: portage-2.2.0_alpha75/cvs/Linux x86_64
RepoMan-Options: --force

4 files changed, 52 insertions, 55 deletions

diff --git a/x11-misc/alltray/ChangeLog b/x11-misc/alltray/ChangeLog
index f8fa21bfc593..e0f60ba28370 100644
--- a/x11-misc/alltray/ChangeLog
+++ b/x11-misc/alltray/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/alltray
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/alltray/ChangeLog,v 1.40 2011/11/20 13:07:31 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/alltray/ChangeLog,v 1.41 2011/11/20 13:11:22 ssuominen Exp $
+
+*alltray-0.7.4 (20 Nov 2011)
+
+  20 Nov 2011; Samuli Suominen <ssuominen@gentoo.org> +alltray-0.7.4.ebuild,
+  -alltray-0.74.ebuild:
+  Rename 0.74 as 0.7.4 to match upstream versioning scheme.
 
 *alltray-0.7.5.1 (20 Nov 2011)
 
diff --git a/x11-misc/alltray/Manifest b/x11-misc/alltray/Manifest
index 776c23531c68..d97aa777e73b 100644
--- a/x11-misc/alltray/Manifest
+++ b/x11-misc/alltray/Manifest
@@ -4,18 +4,18 @@ Hash: SHA1
 AUX alltray-0.7.4-include-fixes.patch 1018 RMD160 c329eff0735ff4ce325f6a50943cae4ace44081a SHA1 74bb58b78c1c43d71beeda1cdd5d250043b3533d SHA256 3048ae8d7121513acc44a81f3e26eb4510ca18f339df1fbc5bc33da9ae327695
 DIST alltray-0.7.4dev.tar.gz 471569 RMD160 3431b7d56a0d63234c7b222554bbb72fada710b5 SHA1 89a9109e12d2e05996f55295637973b8388d7970 SHA256 43c986daaec925748d042987bdc289f81db7ccd510bfaf77e2062611232022dc
 DIST alltray-0.7.5.1dev.tar.gz 481458 RMD160 f74a682033ef7ec722af18033e003134c6e0952e SHA1 c2360adbdbfb6188ace5db9a6ab06957f677f801 SHA256 09dad447b85ecb57debcb423f34381db7f112a010fbc83e4f65b3b31cf416514
+EBUILD alltray-0.7.4.ebuild 891 RMD160 03ca08f43a7eeb6777f01c99520f0d1765ee699a SHA1 024f69efe5ea7f153d331cbc3c9b71a11f46a63a SHA256 3608866c3a4aa0263cd20defae06efce14fa0b8fa6bd6d6914ab6ecbb2b971f0
 EBUILD alltray-0.7.5.1.ebuild 1123 RMD160 074611af4a621f2a95329ef4f41146580b006de9 SHA1 6bb36c3af801d691d3f82a8973996fe0710d8ec9 SHA256 30526486966140f33dd605b4b77cca5b05c9a6b53b57675a4a2408c12bf00cdd
-EBUILD alltray-0.74.ebuild 1199 RMD160 01e33e355f7a19cfa3d7d8f870555fafe22453bd SHA1 aeeb5c7b9b8075639861b1b33821cb93b02bc7bc SHA256 6ff720b33f552c9180a1ed443095248514554ca8a9e6fc897b376fe9b7219b67
-MISC ChangeLog 5349 RMD160 71d3a1eb8502ee2565bb151795d674c4aab96bf2 SHA1 808ee5dc0413233ab0dc4107387af8b1145a817d SHA256 3a1440a90312fabd9a5838e0fb7cba3b6140e23647b5ba7095a0c1547e047591
+MISC ChangeLog 5541 RMD160 e5f395a2fe9a4b28e39e79849bb4ecba785bda21 SHA1 8209e89b3510116619fb1d0d319167b5a758c1fc SHA256 70a4063636d4153939d9fe7e6f403641d72971797369ae1932a8431ce4d85295
 MISC metadata.xml 574 RMD160 95a71af9a3fa4c0fed713553ebe276e1b609f610 SHA1 3a38000f0414376fa860869e1c404a5632c75d37 SHA256 e95a331d0a3348fa2332860aa6fbf31a2bd9bea680d7134791206be1e4b384bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOyPsrAAoJEEdUh39IaPFNRuAH/ilhdbpGJRQ8XxkLLy5Zas1X
-xXsBBWWL9h8QQDR17p/AMo3y7OSq+cSSabJmtHkFO85T8qmBgeFbYClKVlVeS4DC
-B0j+ckh33lU2xtItmMHc5CtuEozqepMVxiFhEY1UXcSDLBGC/HnFIk3x3AoBpzpT
-DUxdjwfelSqeed+j4LLCGvBDdmaJNmkeCnuCqVVP6UsIvr1E4QrVBeJq79heYH9q
-tyhVnH5tjJe1HTAE1IMO1RQBW3hFfgsF3QiQrbszSkc+rUz/77lnnAapKfbWgb20
-ClLYhOBLJ9UJ6pKvHZfnCohSL7XEpTR8oG2wv7wQGVxE6JPyruttDzRXyyigN8w=
-=kgwW
+iQEcBAEBAgAGBQJOyPwTAAoJEEdUh39IaPFNnEcH/212/XLD3QLh204MN5qDayTi
+l9nvkyy9mzoLGmTzQ1qiNIlRpp1rR8ZWD8DtJeB6g0HYaRMyAHDw3CafnQ4eMQ7n
+/47IJ5jk6J/pbEj9PpNZAZAKutU4c79jNKdwuGoLhB/UxgRAIAxdZQJiiadIjWTT
+pZ6N3t22KtsJmyrAL2EyNAn5H1MAccv03QmRQgX88NKukNbMfxAXc06MXum1j5fT
+hgDnm6iKe7G++V6bIqwU34TIMS1IuFGqw634kBvUcbFmMZUEPa0hBa0i3PUNJgy6
+kfj+fGikNcrdG/sJRkge2xdUoMd0CTyKzhLbMU/pLFhNv8EWykqAd3nYp6EQBfM=
+=vHEk
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/alltray/alltray-0.7.4.ebuild b/x11-misc/alltray/alltray-0.7.4.ebuild
new file mode 100644
index 000000000000..185c41bbf93c
--- /dev/null
+++ b/x11-misc/alltray/alltray-0.7.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/alltray/alltray-0.7.4.ebuild,v 1.1 2011/11/20 13:11:22 ssuominen Exp $
+
+EAPI=4
+inherit eutils
+
+MY_P=${P}dev
+
+DESCRIPTION="Dock any application into the system tray/notification area"
+HOMEPAGE="http://alltray.trausch.us/"
+SRC_URI="http://code.launchpad.net/${PN}/trunk/${PV}dev/+download/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2
+	dev-libs/glib:2
+	gnome-base/libgtop:2
+	x11-libs/libwnck:1
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog README )
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-include-fixes.patch
+
+	# Drop DEPRECATED flags, bug #391101
+	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED::' src/Makefile.{am,in} || die
+}
diff --git a/x11-misc/alltray/alltray-0.74.ebuild b/x11-misc/alltray/alltray-0.74.ebuild
deleted file mode 100644
index a20bdfb8cba0..000000000000
--- a/x11-misc/alltray/alltray-0.74.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/alltray/alltray-0.74.ebuild,v 1.6 2011/11/20 12:30:26 pacho Exp $
-
-# remove this kludge once old releases have been removed from the tree
-MY_PV="${PV:0:1}.${PV:2:1}.${PV:3:1}"
-MY_PV_DEV="${MY_PV}dev"
-MY_P="${PN}-${MY_PV}"
-MY_P_DEV="${PN}-${MY_PV_DEV}"
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="Dock any application into the system tray/notification area"
-HOMEPAGE="http://alltray.trausch.us/"
-SRC_URI="http://code.launchpad.net/${PN}/trunk/${MY_PV_DEV}/+download/${MY_P_DEV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2
-	dev-libs/glib:2
-	gnome-base/libgtop:2
-	x11-libs/libwnck:1
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9.0"
-
-S="${WORKDIR}/${MY_P_DEV}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${MY_P}-include-fixes.patch
-
-	# Drop DEPRECATED flags, bug #391101
-	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED::' \
-		src/Makefile.am src/Makefile.in || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog README || die "dodoc failed"
-}