Version bump to final doctrine1; Drop old

(Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 67C78E1D)

5 files changed, 16 insertions, 98 deletions

diff --git a/dev-php/doctrine/ChangeLog b/dev-php/doctrine/ChangeLog
index f6e443c74645..7c67758831b0 100644
--- a/dev-php/doctrine/ChangeLog
+++ b/dev-php/doctrine/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-php/doctrine
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/doctrine/ChangeLog,v 1.3 2011/03/21 07:17:24 olemarkus Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/doctrine/ChangeLog,v 1.4 2014/10/30 04:27:21 grknight Exp $
+
+*doctrine-1.2.5 (30 Oct 2014)
+
+  30 Oct 2014; Brian Evans <grknight@gentoo.org> +doctrine-1.2.5.ebuild,
+  -doctrine-1.2.1.ebuild, -doctrine-1.2.2.ebuild, -doctrine-1.2.3.ebuild,
+  -doctrine-1.2.4.ebuild:
+  Version bump to final doctrine1; Drop old
 
 *doctrine-1.2.4 (21 Mar 2011)
 
@@ -22,4 +29,3 @@
   02 Jan 2010; Ben de Groot <yngwin@gentoo.org> +doctrine-1.2.1.ebuild,
   +metadata.xml:
   Initial import. Ebuild by me.
-
diff --git a/dev-php/doctrine/doctrine-1.2.1.ebuild b/dev-php/doctrine/doctrine-1.2.1.ebuild
deleted file mode 100644
index a277b3ee6d26..000000000000
--- a/dev-php/doctrine/doctrine-1.2.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/doctrine/doctrine-1.2.1.ebuild,v 1.1 2011/03/12 19:49:23 olemarkus Exp $
-
-EAPI="2"
-inherit depend.php
-
-MY_P="Doctrine-${PV}"
-DESCRIPTION="An object relational mapper for PHP5"
-HOMEPAGE="http://www.doctrine-project.org/"
-SRC_URI="http://www.doctrine-project.org/downloads/${MY_P}.tgz"
-
-LICENSE="LGPL-2.1 MIT BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/php-5.2.3[cli,pdo]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-need_php_by_category
-
-src_install() {
-	has_php
-
-	insinto /usr/share/php5/Doctrine
-	doins -r lib/*
-
-	dodoc-php CHANGELOG
-}
diff --git a/dev-php/doctrine/doctrine-1.2.2.ebuild b/dev-php/doctrine/doctrine-1.2.2.ebuild
deleted file mode 100644
index ea60c52d4e7e..000000000000
--- a/dev-php/doctrine/doctrine-1.2.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/doctrine/doctrine-1.2.2.ebuild,v 1.1 2011/03/12 19:49:23 olemarkus Exp $
-
-EAPI="2"
-inherit depend.php
-
-MY_P="Doctrine-${PV}"
-DESCRIPTION="An object relational mapper for PHP5"
-HOMEPAGE="http://www.doctrine-project.org/"
-SRC_URI="http://www.doctrine-project.org/downloads/${MY_P}.tgz"
-
-LICENSE="LGPL-2.1 MIT BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/php-5.2.3[cli,pdo]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-need_php_by_category
-
-src_install() {
-	insinto /usr/share/php5/Doctrine
-	doins -r lib/*
-
-	dodoc-php CHANGELOG
-}
diff --git a/dev-php/doctrine/doctrine-1.2.4.ebuild b/dev-php/doctrine/doctrine-1.2.4.ebuild
deleted file mode 100644
index 5d471e444f5d..000000000000
--- a/dev-php/doctrine/doctrine-1.2.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/doctrine/doctrine-1.2.4.ebuild,v 1.1 2011/03/21 07:17:24 olemarkus Exp $
-
-EAPI="2"
-
-MY_P="Doctrine-${PV}"
-DESCRIPTION="An object relational mapper for PHP5"
-HOMEPAGE="http://www.doctrine-project.org/"
-SRC_URI="http://www.doctrine-project.org/downloads/${MY_P}.tgz"
-
-LICENSE="LGPL-2.1 MIT BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/php-5.2.3[cli,pdo]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	insinto /usr/share/php
-	doins -r Doctrine
-	doins Doctrine.php
-}
diff --git a/dev-php/doctrine/doctrine-1.2.3.ebuild b/dev-php/doctrine/doctrine-1.2.5.ebuild
index 77996ffcc31f..b1eb9f290b8c 100644
--- a/dev-php/doctrine/doctrine-1.2.3.ebuild
+++ b/dev-php/doctrine/doctrine-1.2.5.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/doctrine/doctrine-1.2.3.ebuild,v 1.1 2011/03/12 20:43:04 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/doctrine/doctrine-1.2.5.ebuild,v 1.1 2014/10/30 04:27:21 grknight Exp $
 
-EAPI="2"
+EAPI=5
 
-MY_P="Doctrine-${PV}"
+MY_P="${PN}1-${PV}"
 DESCRIPTION="An object relational mapper for PHP5"
 HOMEPAGE="http://www.doctrine-project.org/"
-SRC_URI="http://www.doctrine-project.org/downloads/${MY_P}.tgz"
+SRC_URI="https://github.com/${PN}/${PN}1/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1 MIT BSD"
 SLOT="0"
@@ -21,6 +21,6 @@ S="${WORKDIR}/${MY_P}"
 
 src_install() {
 	insinto /usr/share/php
-	doins -r Doctrine
-	doins Doctrine.php
+	doins -r lib/Doctrine
+	doins lib/Doctrine.php
 }