commit: 7b383b23d246a075c82dcb51887b22416af629ad Author: Justin Lecher <jlec <AT> gentoo <DOT> org> AuthorDate: Thu Dec 3 09:44:12 2015 +0000 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> CommitDate: Thu Dec 3 10:21:03 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b383b23
dev-tex/minted: Chop DESCRIPTION to 80 chars 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 insertions(+) diff --git a/dev-tex/minted/minted-1.7.ebuild b/dev-tex/minted/minted-1.7.ebuild index 0331cba..3e4ed32 100644 --- a/dev-tex/minted/minted-1.7.ebuild +++ b/dev-tex/minted/minted-1.7.ebuild @@ -6,7 +6,11 @@ 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 07ed452..a72ed11 100644 --- a/dev-tex/minted/minted-2.0.ebuild +++ b/dev-tex/minted/minted-2.0.ebuild @@ -6,7 +6,11 @@ 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"
