commit: 7f5e120c432b5fa3a02e5b2ec8c82a38ed5272ba Author: Justin Lecher <jlec <AT> gentoo <DOT> org> AuthorDate: Thu Dec 3 12:49:28 2015 +0000 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> CommitDate: Thu Dec 3 12:49:39 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f5e120c
dev-tex/minted: Fix bad merge Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=567448 Package-Manager: portage-2.2.25 Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> dev-tex/minted/minted-1.7.ebuild | 4 ---- dev-tex/minted/minted-2.0.ebuild | 4 ---- 2 files changed, 8 deletions(-) diff --git a/dev-tex/minted/minted-1.7.ebuild b/dev-tex/minted/minted-1.7.ebuild index 3e4ed32..0331cba 100644 --- a/dev-tex/minted/minted-1.7.ebuild +++ b/dev-tex/minted/minted-1.7.ebuild @@ -6,11 +6,7 @@ EAPI=5 inherit latex-package -<<<<<<< 1b4109b06fe34ac39f3fc55996d66a9b6cc8d809 DESCRIPTION="LaTeX package for source code syntax highlighting" -======= -DESCRIPTION="Expressive syntax highlighting in using the powerful Pygments library" ->>>>>>> dev-tex/minted: Chop DESCRIPTION to 80 chars HOMEPAGE="https://code.google.com/p/minted/"; SRC_URI="https://minted.googlecode.com/files/${PN}-v${PV}.zip"; diff --git a/dev-tex/minted/minted-2.0.ebuild b/dev-tex/minted/minted-2.0.ebuild index a72ed11..07ed452 100644 --- a/dev-tex/minted/minted-2.0.ebuild +++ b/dev-tex/minted/minted-2.0.ebuild @@ -6,11 +6,7 @@ EAPI=5 inherit latex-package -<<<<<<< 1b4109b06fe34ac39f3fc55996d66a9b6cc8d809 DESCRIPTION="LaTeX package for source code syntax highlighting" -======= -DESCRIPTION="Expressive syntax highlighting in using the powerful Pygments library" ->>>>>>> dev-tex/minted: Chop DESCRIPTION to 80 chars HOMEPAGE="https://github.com/gpoore/minted"; SRC_URI="https://github.com/gpoore/minted/archive/v${PV}.tar.gz -> ${P}.tar.gz"
