summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Hüttel <dilfridge@gentoo.org>2012-06-01 20:13:20 +0000
committerAndreas Hüttel <dilfridge@gentoo.org>2012-06-01 20:13:20 +0000
commitd96a8f8000cd9d5aa62a5584ba0a1ce5c26b2bd0 (patch)
tree6e48f080e14432c49484b5023b29961f9129ea6f /app-text/xournal
parentcleaned up ebuild, added logic to switch to python2 as required for this part... (diff)
downloadhistorical-d96a8f8000cd9d5aa62a5584ba0a1ce5c26b2bd0.tar.gz
historical-d96a8f8000cd9d5aa62a5584ba0a1ce5c26b2bd0.tar.bz2
historical-d96a8f8000cd9d5aa62a5584ba0a1ce5c26b2bd0.zip
Version bump; remove old
Package-Manager: portage-2.2.0_alpha108/cvs/Linux x86_64
Diffstat (limited to 'app-text/xournal')
-rw-r--r--app-text/xournal/ChangeLog8
-rw-r--r--app-text/xournal/Manifest26
-rw-r--r--app-text/xournal/xournal-0.4.6.ebuild (renamed from app-text/xournal/xournal-0.4.5_p20111022.ebuild)11
3 files changed, 37 insertions, 8 deletions
diff --git a/app-text/xournal/ChangeLog b/app-text/xournal/ChangeLog
index 20299cdb4c73..33f1e8ce0248 100644
--- a/app-text/xournal/ChangeLog
+++ b/app-text/xournal/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for app-text/xournal
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/ChangeLog,v 1.31 2012/05/04 03:33:15 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/ChangeLog,v 1.32 2012/06/01 20:13:20 dilfridge Exp $
+
+*xournal-0.4.6 (01 Jun 2012)
+
+ 01 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+ -xournal-0.4.5_p20111022.ebuild, +xournal-0.4.6.ebuild:
+ Version bump; remove old
04 May 2012; Jeff Horelick <jdhore@gentoo.org>
xournal-0.4.5_p20111022.ebuild, xournal-0.4.5_p20111022-r1.ebuild,
diff --git a/app-text/xournal/Manifest b/app-text/xournal/Manifest
index 9c6728039bc6..780749a96dc1 100644
--- a/app-text/xournal/Manifest
+++ b/app-text/xournal/Manifest
@@ -1,11 +1,33 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
AUX xournal-0.4.5_p20111022-aspectratio.patch 3547 RMD160 fc53a86e58b7f5c0de3d3e31c43506d88b120a11 SHA1 fdb8fdaeeb4cfb8022c1a0c899a5bf024e2c29e1 SHA256 27791e240551c2987088d8d979a9389a9dbbb9fda836d537f3637e7966af52ac
AUX xournal-0.4.5_p20111022-gtk-recent.patch 11391 RMD160 411e88bbe51468cb58ff0debe999d46b53ad79a6 SHA1 8bde995a0757ee691afbca0afa3efc5ddab76339 SHA256 d9b8bf35b527e4283554b804acd0a455f66a8e08fa753370bca34ae543d1f58c
AUX xournal-0.4.5_p20111022-underlinking.patch 792 RMD160 6516d38a26159f63f2a2daae8a1f24448ce0a06d SHA1 583ead6936d06b9c07e57920f93e9d40fe3f1f05 SHA256 2e44dc7deafd62dcd01d1aca848a7bcb5bf93d648625e76715f0be03c45386c5
DIST xournal-0.4.5_p20111022-r2-patchset.tar.xz 35776 RMD160 a166eb7d6ba7aecce8161d3c9c5d7566d9c3dede SHA1 29cab6debcd2228a70adcffa4c920db50c8ba9db SHA256 4375f116ff82cae1e9497f1b76797a519319bf4012d4aa1262caee75406aeea4
DIST xournal-0.4.5_p20111022-sjg-image-rev7.patch.gz 21551 RMD160 6048a996fdb7b43e05beff67cf5ae0da53cff840 SHA1 0ff950726a7ad5b0012421c158406d6d49d2c38d SHA256 88b050483fc27f37f307adb358b3e5c4bfc0b600b7d3427599dea4c1ffe87fc2
DIST xournal-0.4.5_p20111022.tar.xz 332700 RMD160 6578c037ad536c0173c533758c5f86ffc046dfbe SHA1 69f66e1125ba3de3deea14be1eb6d7e8f07abe61 SHA256 46573706645a78f1cbdd9e3eed0b2409ab61947eb5f78be9c1b7d7e4535f721f
+DIST xournal-0.4.6-gentoo.patch.xz 32720 RMD160 4cab7d7580d98ae9186fa39ab7ced7b9975ca15a SHA1 349acbf691b3c72a64defbffb2fb2f9baf203a7f SHA256 e8f03410cb1e31b50cac3b646fc5670f349f7ebc68854a481e2046de71ce38bf
+DIST xournal-0.4.6.tar.xz 335128 RMD160 76ce8b2ac642c8a61dc22d821c0830b86c85cdb7 SHA1 7ad0654ed0c96ee874d6bcbb04c66413066a8a2e SHA256 4310fe579b8e99a66c40ba923fe0dce2e8543ad69c7660a01a675637970057d3
EBUILD xournal-0.4.5_p20111022-r1.ebuild 1354 RMD160 11f1306ea61e3cfceb1366e39c380df4bcd77f0a SHA1 8502d5f5bb2cede515811077434a2a9d338aa61c SHA256 f6d6a3f982f9e00fa1f22a1f16f7213db5748b81c2fb40934f47f15f7d2e5c26
EBUILD xournal-0.4.5_p20111022-r2.ebuild 1294 RMD160 345104f609ac63ffcdc0cfbd676a8d7fbdd04ce3 SHA1 e0d6fcef442499ad5eb00770a53f6b7157c0a0bf SHA256 100e13ddd84d3d95488c4f68acb8d9e2bc73a8d6fc9f00aa54e1c0f24ce97743
-EBUILD xournal-0.4.5_p20111022.ebuild 1235 RMD160 c9f10fbc76ef34b8c9df77bea1ff92b766b1a975 SHA1 bbac1e2afd8e4ff8bf701524d93b4876947029d6 SHA256 1720ba3c53a0cd0fbcf1838c8a57b6d85503bc279578c16730c6cf293757b6cc
-MISC ChangeLog 5503 RMD160 3b5b8e3f891a214a6755fcc594dfb896bbbdaa5e SHA1 42065211d3f1702bdf31a86d9fa71bbc6510912f SHA256 ff9d500eafcb4e3714bbf4e40d7f7524f2d16f56f2f63cb9f27c3de178569984
+EBUILD xournal-0.4.6.ebuild 1285 RMD160 16a425fbea060b1490030f6a91b57c20b4eb6ca5 SHA1 5fb65840ed5e78099fdfdffcc5de44e45ee0dd7a SHA256 349216a1e6d17a36c8338e94751cfbccd47f13f4b0ec120bde6fe8cff4ece3eb
+MISC ChangeLog 5679 RMD160 0b79186ed5cb8d8bbe830af26b84a9ee1003c61b SHA1 dae10703041386485b73256ff1c83bbb2cc64d64 SHA256 99546e8d38de90dfe5a555558e1d5a9520ad980d5385a0b48df9ed3bee35dc43
MISC metadata.xml 561 RMD160 994fde5a7482cd84910d37246072d1fd848da7c5 SHA1 cc77d272a12b97e7e08a2764086c78746fc919e4 SHA256 e0c14d0d41505ee0ff810d8bfd6f6ac751b287e84d171d114f5a48becf91b7c1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCgAGBQJPySKpAAoJENwGBM22xffe3IEP+wYK8plp00omKAAk5fW+Al8l
+/bUnwsKwiD8lY+DtKcVy62xEGE44UkaMsrwGk9PBdj09wZS8D0Pr1pbsiE0eAflr
+PdHQdz8qgE+isSDrTp7lKjGjvzXgok2ULAjWgeDJu9ijv+dKIL+EAdFrATv+dg1o
+lwOOy8DeDNWJ1Mhb9HfXr+4YYHHQveLi+qiobTWOugcCHKg0QyFMi3+S4mIbgNwc
+MEKe59sP5MNY54Gl29GIHVPbq7qpI/1c6aBweoneFVKNmfeasEnU4oEM7KdAPmVp
+RE/x3MCzXdTKzV92Gm4RZxxdx9sXNDlMl5o+MiD9Oi4BgDXDS3pdksWHooMVj36S
+oQ6EOEg1xZunTvgunYRc6eFx2AtsuTgvsPdnhGtvySHmBf6mjnHP4u2fmj3jbhbZ
+TW4P/nrPKgcLFNkRY5sFT3xv6o8noAD+L5wwsOkPTqcoaic4lSeUzH3jq1r55rro
+MccZL6fXsjbKBDI+itJi+Ofg1QlECwQb/Udxo9NQbo13bLbwtqQcKRgdTLYuFExo
+6zoe1bfFMeKwc7TtL5j9tRWW9npv/AJMHEgEEUj/Cstx2j3kYagLGg4Vutcxw8WT
+2pjhb4vty0J4ksMEq/2olguXIL88cZQ/ZPwd65AhQQSqMMbhT9+EKJf87KsTuHnH
+wSgiK2DgsAhTMYVDwvGX
+=5/ej
+-----END PGP SIGNATURE-----
diff --git a/app-text/xournal/xournal-0.4.5_p20111022.ebuild b/app-text/xournal/xournal-0.4.6.ebuild
index 05135a0ca938..1e8dfee73506 100644
--- a/app-text/xournal/xournal-0.4.5_p20111022.ebuild
+++ b/app-text/xournal/xournal-0.4.6.ebuild
@@ -1,21 +1,21 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-0.4.5_p20111022.ebuild,v 1.5 2012/05/04 03:33:15 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-0.4.6.ebuild,v 1.1 2012/06/01 20:13:20 dilfridge Exp $
EAPI=4
GCONF_DEBUG=no
-inherit gnome2 eutils autotools
+inherit gnome2 autotools
DESCRIPTION="Xournal is an application for notetaking, sketching, and keeping a journal using a stylus."
HOMEPAGE="http://xournal.sourceforge.net/"
-SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz http://dev.gentoo.org/~dilfridge/distfiles/${P}-sjg-image-rev7.patch.gz"
+SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz http://dev.gentoo.org/~dilfridge/distfiles/${P}-gentoo.patch.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE="+pdf"
COMMONDEPEND="
@@ -39,7 +39,8 @@ DEPEND="${COMMONDEPEND}
"
src_prepare() {
- epatch "${DISTDIR}"/${P}-sjg-image-rev7.patch.gz # the image patch
+ epatch "${WORKDIR}"/${P}-gentoo.patch
+ sed -e "s:n http:n Gentoo release ${PVR}\\\\n http:" -i "${S}"/src/xo-interface.c
eautoreconf
}